diff --git a/css/css-animations/CSSAnimation-getComputedTiming.tentative.html b/css/css-animations/AnimationEffect-getComputedTiming.tentative.html
similarity index 99%
rename from css/css-animations/CSSAnimation-getComputedTiming.tentative.html
rename to css/css-animations/AnimationEffect-getComputedTiming.tentative.html
index fb13f7abbdf5af..fd2197fcace453 100644
--- a/css/css-animations/CSSAnimation-getComputedTiming.tentative.html
+++ b/css/css-animations/AnimationEffect-getComputedTiming.tentative.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <meta charset=utf-8>
-<title>CSSAnimation.getComputedTiming()</title>
+<title>AnimationEffect.getComputedTiming() for CSS animations</title>
 <!-- TODO: Add a more specific link for this once it is specified. -->
 <link rel="help" href="https://drafts.csswg.org/css-animations-2/#cssanimation">
 <script src="/resources/testharness.js"></script>
diff --git a/css/css-animations/CSSAnimation-animationName.tentative.html b/css/css-animations/CSSAnimation-animationName.tentative.html
index 49bd0afb472188..370d5ef85e27c2 100644
--- a/css/css-animations/CSSAnimation-animationName.tentative.html
+++ b/css/css-animations/CSSAnimation-animationName.tentative.html
@@ -11,7 +11,6 @@
   to { left: 100px }
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -39,4 +38,3 @@
 }, 'Animation name with hex-escape');
 
 </script>
-</body>
diff --git a/css/css-animations/CSSAnimation-canceling.tentative.html b/css/css-animations/CSSAnimation-canceling.tentative.html
index a9e165417ee8dd..b76af2c24ac636 100644
--- a/css/css-animations/CSSAnimation-canceling.tentative.html
+++ b/css/css-animations/CSSAnimation-canceling.tentative.html
@@ -18,7 +18,6 @@
   to { margin-left: 200px }
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -195,5 +194,3 @@
    'descendants');
 
 </script>
-</body>
-</html>
diff --git a/css/css-animations/CSSAnimation-effect.tentative.html b/css/css-animations/CSSAnimation-effect.tentative.html
index 6597547f846899..d288f47c60f536 100644
--- a/css/css-animations/CSSAnimation-effect.tentative.html
+++ b/css/css-animations/CSSAnimation-effect.tentative.html
@@ -16,7 +16,6 @@
   }
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -129,4 +128,3 @@
    'it fires an animationstart event');
 
 </script>
-</body>
diff --git a/css/css-animations/CSSAnimation-finished.tentative.html b/css/css-animations/CSSAnimation-finished.tentative.html
index 0003286de4ab62..57dd0d5020c9d6 100644
--- a/css/css-animations/CSSAnimation-finished.tentative.html
+++ b/css/css-animations/CSSAnimation-finished.tentative.html
@@ -12,7 +12,6 @@
 }
 @keyframes def {}
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -84,4 +83,3 @@
 }, 'finished promise is not reset when animationPlayState is set to running');
 
 </script>
-</body>
diff --git a/css/css-animations/CSSAnimation-getCurrentTime.tentative.html b/css/css-animations/CSSAnimation-getCurrentTime.tentative.html
index fbe51f6df3fae9..4a0b9bdce744d9 100644
--- a/css/css-animations/CSSAnimation-getCurrentTime.tentative.html
+++ b/css/css-animations/CSSAnimation-getCurrentTime.tentative.html
@@ -1,10 +1,11 @@
 <!doctype html>
-<html>
-<head>
 <meta charset=utf-8>
 <title>CSSAnimation.currentTime</title>
 <!-- TODO: Add a more specific link for this once it is specified. -->
 <link rel="help" href="https://drafts.csswg.org/css-animations-2/#cssanimation">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
 
 .animated-div {
@@ -19,11 +20,6 @@
 }
 
 </style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support/testcommon.js"></script>
-</head>
-<body>
 <div id="log"></div>
 <script type="text/javascript">
 
@@ -70,5 +66,3 @@
 }, 'Setting currentTime to null on a CSS animation throws');
 
 </script>
-</body>
-</html>
diff --git a/css/css-animations/CSSAnimation-id.tentative.html b/css/css-animations/CSSAnimation-id.tentative.html
index 79651c2d650896..623e01d2354aad 100644
--- a/css/css-animations/CSSAnimation-id.tentative.html
+++ b/css/css-animations/CSSAnimation-id.tentative.html
@@ -9,7 +9,6 @@
 <style>
 @keyframes abc { }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -25,5 +24,4 @@
 }, 'Animation.id for CSS Animations');
 
 </script>
-</body>
 </html>
diff --git a/css/css-animations/CSSAnimation-pausing.tentative.html b/css/css-animations/CSSAnimation-pausing.tentative.html
index 34dd06b0da6475..2b6e6853b4178f 100644
--- a/css/css-animations/CSSAnimation-pausing.tentative.html
+++ b/css/css-animations/CSSAnimation-pausing.tentative.html
@@ -12,7 +12,6 @@
   100% { margin-left: 10000px }
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -169,4 +168,3 @@
 }, 'Setting the current time completes a pending pause');
 
 </script>
-</body>
diff --git a/css/css-animations/CSSAnimation-playState.tentative.html b/css/css-animations/CSSAnimation-playState.tentative.html
index be95b4fc31cd41..acfdc1348fb0ac 100644
--- a/css/css-animations/CSSAnimation-playState.tentative.html
+++ b/css/css-animations/CSSAnimation-playState.tentative.html
@@ -9,7 +9,6 @@
 <style>
 @keyframes anim { }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -54,4 +53,3 @@
 }, 'Animation returns correct playState when canceled');
 
 </script>
-</body>
diff --git a/css/css-animations/CSSAnimation-ready.tentative.html b/css/css-animations/CSSAnimation-ready.tentative.html
index 99fa0856ce370f..f70ebd17003988 100644
--- a/css/css-animations/CSSAnimation-ready.tentative.html
+++ b/css/css-animations/CSSAnimation-ready.tentative.html
@@ -11,7 +11,6 @@
   to { transform: translate(10px) }
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -97,4 +96,3 @@
 }, 'Pausing twice re-uses the same Promise');
 
 </script>
-</body>
diff --git a/css/css-animations/CSSAnimation-startTime.tentative.html b/css/css-animations/CSSAnimation-startTime.tentative.html
index 9c8c57b406e11b..edef3b239e8a6c 100644
--- a/css/css-animations/CSSAnimation-startTime.tentative.html
+++ b/css/css-animations/CSSAnimation-startTime.tentative.html
@@ -1,10 +1,11 @@
 <!doctype html>
-<html>
-<head>
 <meta charset=utf-8>
 <title>CSSAnimation.startTime</title>
 <!-- TODO: Add a more specific link for this once it is specified. -->
 <link rel="help" href="https://drafts.csswg.org/css-animations-2/#cssanimation">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/testcommon.js"></script>
 <style>
 
 .animated-div {
@@ -19,11 +20,6 @@
 }
 
 </style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support/testcommon.js"></script>
-</head>
-<body>
 <div id="log"></div>
 <script type="text/javascript">
 
@@ -71,5 +67,3 @@
 }, 'Seeking a CSS animation using the start time dispatches animation events');
 
 </script>
-</body>
-</html>
diff --git a/css/css-animations/CSSPseudoElement-getAnimations.tentative.html b/css/css-animations/CSSPseudoElement-getAnimations.tentative.html
index f1257fe481fbe6..8fcdf3879dc032 100644
--- a/css/css-animations/CSSPseudoElement-getAnimations.tentative.html
+++ b/css/css-animations/CSSPseudoElement-getAnimations.tentative.html
@@ -26,7 +26,6 @@
   content: '';
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -74,4 +73,3 @@
    'animations in the expected order');
 
 </script>
-</body>
diff --git a/css/css-animations/Document-getAnimations.tentative.html b/css/css-animations/Document-getAnimations.tentative.html
index 1ebf4657fa011b..c11b0a908760f4 100644
--- a/css/css-animations/Document-getAnimations.tentative.html
+++ b/css/css-animations/Document-getAnimations.tentative.html
@@ -25,7 +25,6 @@
   content: ''
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -283,4 +282,3 @@
    'after sorting');
 
 </script>
-</body>
diff --git a/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html b/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html
index ca6a23c13b0e25..a5e22884271cf3 100644
--- a/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html
+++ b/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html
@@ -14,7 +14,6 @@
 }
 @keyframes anim2 { }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -162,4 +161,3 @@
 }, 'Animation state is preserved when interleaving animations in list');
 
 </script>
-</body>
diff --git a/css/css-animations/Element-getAnimations.tentative.html b/css/css-animations/Element-getAnimations.tentative.html
index ee80cacf15b874..23f9ec8e384153 100644
--- a/css/css-animations/Element-getAnimations.tentative.html
+++ b/css/css-animations/Element-getAnimations.tentative.html
@@ -24,7 +24,6 @@
 }
 @keyframes empty { }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -446,4 +445,3 @@
    + ' from all the descendants');
 
 </script>
-</body>
diff --git a/css/css-animations/KeyframeEffect-target.tentative.html b/css/css-animations/KeyframeEffect-target.tentative.html
index cc066b4ec19fb8..4991762099d4fa 100644
--- a/css/css-animations/KeyframeEffect-target.tentative.html
+++ b/css/css-animations/KeyframeEffect-target.tentative.html
@@ -15,7 +15,6 @@
   content: ''
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -62,4 +61,3 @@
    'CSSPseudoElement object as that from the CSS generated animation');
 
 </script>
-</body>
diff --git a/css/css-animations/event-dispatch.tentative.html b/css/css-animations/event-dispatch.tentative.html
index 6211cbff0e182d..54bc9499a535db 100644
--- a/css/css-animations/event-dispatch.tentative.html
+++ b/css/css-animations/event-dispatch.tentative.html
@@ -11,7 +11,6 @@
   to { margin-left: 100px; }
 }
 </style>
-<body>
 <div id="log"></div>
 <script>
 'use strict';
@@ -419,5 +418,3 @@
 }, 'Cancel the animation after clearing the target effect.');
 
 </script>
-</body>
-</html>
diff --git a/css/css-animations/event-order.tentative.html b/css/css-animations/event-order.tentative.html
index 91d3851c015e10..93d452ace07163 100644
--- a/css/css-animations/event-order.tentative.html
+++ b/css/css-animations/event-order.tentative.html
@@ -11,7 +11,6 @@
     to { margin-left: 100px; }
   }
 </style>
-<body>
 <div id="log"></div>
 <script type='text/javascript'>
 'use strict';
@@ -160,5 +159,3 @@
 }, 'Test start and end events are sorted correctly when fired simultaneously');
 
 </script>
-</body>
-</html>
