diff --git a/src/animation.js b/src/animation.js
index e6ac863..faf3611 100644
--- a/src/animation.js
+++ b/src/animation.js
@@ -172,11 +172,15 @@
       this._paused = true;
     },
     finish: function() {
-      if (this._idle)
-        return;
-      this.currentTime = this._playbackRate > 0 ? this._totalDuration : 0;
-      this._startTime = this._totalDuration - this.currentTime;
+      var limit = this._playbackRate > 0 ? this._totalDuration : 0;
+      this.currentTime = limit;
+      if (this.startTime === null) {
+        this._startTime = this._timeline.currentTime - limit / this._playbackRate;
+      }
       this._currentTimePending = false;
+      this._idle = false;
+      this._paused = false;
+      this._finished = true;
       scope.invalidateEffects();
     },
     cancel: function() {
diff --git a/test/js/animation.js b/test/js/animation.js
index 8c67ca6..4b22835 100644
--- a/test/js/animation.js
+++ b/test/js/animation.js
@@ -318,12 +318,12 @@ suite('animation', function() {
     tick(1000);
     var a = document.body.animate([], 2000);
     a.finish();
-    assert.equal(a.startTime, 0);
+    assert.equal(a.startTime, -1000);
     assert.equal(a.currentTime, 2000);
     a.reverse();
     a.finish();
     assert.equal(a.currentTime, 0);
-    assert.equal(a.startTime, 2000);
+    assert.equal(a.startTime, 1000);
     tick(2000);
   });
   test('cancelling clears all effects', function() {
@@ -494,13 +494,13 @@ suite('animation', function() {
     assert.equal(a.startTime, null);
     tick(1);
     a.finish();
-    assert.equal(a.playState, 'idle');
-    assert.equal(a.currentTime, null);
-    assert.equal(a.startTime, null);
+    assert.equal(a.playState, 'finished');
+    assert.equal(a.currentTime, 300);
+    assert.equal(a.startTime, -299);
     tick(2);
-    assert.equal(a.playState, 'idle');
-    assert.equal(a.currentTime, null);
-    assert.equal(a.startTime, null);
+    assert.equal(a.playState, 'finished');
+    assert.equal(a.currentTime, 300);
+    assert.equal(a.startTime, -299);
   });
   test('Pause after cancel', function() {
     var a = document.body.animate([], 300);
diff --git a/test/web-platform-tests-expectations.js b/test/web-platform-tests-expectations.js
index 38fd47a..34280b3 100644
--- a/test/web-platform-tests-expectations.js
+++ b/test/web-platform-tests-expectations.js
@@ -167,16 +167,13 @@ module.exports = {
           'KeyframeEffectReadOnly is not defined',
 
       'Test finish() while pause-pending with negative playbackRate':
-          'assert_equals: The play state of a pause-pending animation should become "finished" after finish() is called expected "finished" but got "paused"',
+          'FLAKY_TEST_RESULT',
 
       'Test finish() while pause-pending with positive playbackRate':
-          'assert_equals: The play state of a pause-pending animation should become "finished" after finish() is called expected "finished" but got "paused"',
-
-      'Test finish() while paused':
-          'assert_equals: The play state of a paused animation should become "finished" after finish() is called expected "finished" but got "paused"',
+          'FLAKY_TEST_RESULT',
 
       'Test finish() while play-pending':
-          'assert_approx_equals: The start time of a play-pending animation should be set after calling finish() expected NaN +/- 0.0005 but got 0',
+          'FLAKY_TEST_RESULT',
 
       'Test finishing of animation with a current time past the effect end':
           'animation.effect.getComputedTiming is not a function',