diff --git a/test/functional/test-cache-sw-core.js b/test/functional/test-cache-sw-core.js
index 1bcc4ef00205..38c9a9b0268e 100644
--- a/test/functional/test-cache-sw-core.js
+++ b/test/functional/test-cache-sw-core.js
@@ -15,7 +15,6 @@
  */
 
 import * as sinon from 'sinon';
-import {timerFor} from '../../src/timer';
 
 /**
  * Cache SW has some side-effects, so we've got to do a little jig to test.
@@ -464,28 +463,24 @@ runner.run('Cache SW', () => {
         });
       });
 
-      describe('with multiple parallel requests', () => {
-        it('forces uniform RTV version of winner', () => {
-          const timer = timerFor(window);
-          // First call will resolve after the first.
+      describe('with cached files', () => {
+        beforeEach(() => {
           cache.cached.push([prevRequest, responseFromRequest(prevRequest)]);
+        });
 
-          return Promise.all([
-            sw.handleFetch(request, clientId),
-            sw.handleFetch(compRequest, clientId),
-          ]).then(responses => {
-            expect(sw.rtvVersion(responses[0].url)).to.equal(
+        describe('with multiple parallel requests', () => {
+          it('forces uniform RTV version of winner', () => {
+            return Promise.all([
+              sw.handleFetch(request, clientId),
+              sw.handleFetch(compRequest, clientId),
+            ]).then(responses => {
+              expect(sw.rtvVersion(responses[0].url)).to.equal(
                 sw.rtvVersion(prevRequest.url));
-            expect(sw.rtvVersion(responses[1].url)).to.equal(
+              expect(sw.rtvVersion(responses[1].url)).to.equal(
                 sw.rtvVersion(prevRequest.url));
+            });
           });
         });
-      });
-
-      describe('with cached files', () => {
-        beforeEach(() => {
-          cache.cached.push([prevRequest, responseFromRequest(prevRequest)]);
-        });
 
         it('fulfills with cached version', () => {
           return sw.handleFetch(compRequest, clientId).then(resp => {
@@ -547,6 +542,22 @@ runner.run('Cache SW', () => {
           });
         });
       });
+
+      describe('without cached files', () => {
+        describe('with multiple parallel requests', () => {
+          it('forces uniform RTV version of winner', () => {
+            return Promise.all([
+              sw.handleFetch(request, clientId),
+              sw.handleFetch(prevRequest, clientId),
+            ]).then(responses => {
+              expect(sw.rtvVersion(responses[0].url)).to.equal(
+                sw.rtvVersion(request.url));
+              expect(sw.rtvVersion(responses[1].url)).to.equal(
+                sw.rtvVersion(request.url));
+            });
+          });
+        });
+      });
     });
   });
 });