diff --git a/packages/linter/tests/fixtures/testvideosize1.json b/packages/linter/tests/fixtures/testvideosize1.json
index 3b7e74a9b..1c2221590 100644
--- a/packages/linter/tests/fixtures/testvideosize1.json
+++ b/packages/linter/tests/fixtures/testvideosize1.json
@@ -5,7 +5,7 @@
         "path": "/",
         "body": "",
         "status": 200,
-        "response": "<!doctype html>\n<html amp lang=\"en\">\n  <head>\n    <meta charset=\"utf-8\">\n    <script async src=\"https://cdn.ampproject.org/v0.js\"></script>\n    <script async custom-element=\"amp-video\" src=\"https://cdn.ampproject.org/v0/amp-video-0.1.js\"></script>\n    <title>Hello, AMPs</title>\n    <link rel=\"canonical\" href=\"https://regular-biology.glitch.me/\">\n    <meta name=\"viewport\" content=\"width=device-width,minimum-scale=1,initial-scale=1\">\n    <script type=\"application/ld+json\">\n      {\n        \"@context\": \"http://schema.org\",\n        \"@type\": \"NewsArticle\",\n        \"headline\": \"Open-source framework for publishing content\",\n        \"datePublished\": \"2015-10-07T12:02:41Z\",\n        \"image\": [\n          \"logo.jpg\"\n        ]\n      }\n    </script>\n    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>\n    <style amp-custom>\n    </style>\n  </head>\n  <body>\n<amp-video autoplay\n  src=\"https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4\"\n  poster=\"https://peach.blender.org/wp-content/uploads/bbb-splash.png\"\n  artwork=\"img/bigbuckbunny.jpg\"\n  title=\"Big Buck Bunny\"\n  album=\"Blender\"\n  artist=\"Blender Foundation\"\n  width=\"720\"\n  height=\"405\"\n  layout=\"responsive\"\n  controls>\n</amp-video>  </body>\n</html>\n",
+        "response": "<!doctype html>\n<html amp lang=\"en\">\n  <head>\n    <meta charset=\"utf-8\">\n    <script async src=\"https://cdn.ampproject.org/v0.js\"></script>\n    <script async custom-element=\"amp-video\" src=\"https://cdn.ampproject.org/v0/amp-video-0.1.js\"></script>\n    <title>Hello, AMPs</title>\n    <link rel=\"canonical\" href=\"https://regular-biology.glitch.me/\">\n    <meta name=\"viewport\" content=\"width=device-width,minimum-scale=1,initial-scale=1\">\n    <script type=\"application/ld+json\">\n      {\n        \"@context\": \"http://schema.org\",\n        \"@type\": \"NewsArticle\",\n        \"headline\": \"Open-source framework for publishing content\",\n        \"datePublished\": \"2015-10-07T12:02:41Z\",\n        \"image\": [\n          \"logo.jpg\"\n        ]\n      }\n    </script>\n    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>\n    <style amp-custom>\n    </style>\n  </head>\n  <body>\n<amp-video autoplay\n  src=\"https://amp-sample-videos.netlify.app/BigBuckBunny.mp4\"\n  poster=\"https://peach.blender.org/wp-content/uploads/bbb-splash.png\"\n  artwork=\"img/bigbuckbunny.jpg\"\n  title=\"Big Buck Bunny\"\n  album=\"Blender\"\n  artist=\"Blender Foundation\"\n  width=\"720\"\n  height=\"405\"\n  layout=\"responsive\"\n  controls>\n</amp-video>  </body>\n</html>\n",
         "rawHeaders": [
             "Date",
             "Wed, 22 Aug 2018 12:41:55 GMT",
diff --git a/packages/optimizer/spec/valid-amp/files/Advanced_Video_Docking.html b/packages/optimizer/spec/valid-amp/files/Advanced_Video_Docking.html
index 1c1aa5627..236d78258 100644
--- a/packages/optimizer/spec/valid-amp/files/Advanced_Video_Docking.html
+++ b/packages/optimizer/spec/valid-amp/files/Advanced_Video_Docking.html
@@ -164,7 +164,7 @@
       
       
       <amp-video
-        src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+        src="https://amp-sample-videos.netlify.app/BigBuckBunny.mp4"
         poster="https://peach.blender.org/wp-content/uploads/bbb-splash.png"
         artwork="img/bigbuckbunny.jpg"
         title="Big Buck Bunny"
diff --git a/packages/optimizer/spec/valid-amp/files/Rich_Media_Notifications.html b/packages/optimizer/spec/valid-amp/files/Rich_Media_Notifications.html
index bf380b136..806fccf0f 100644
--- a/packages/optimizer/spec/valid-amp/files/Rich_Media_Notifications.html
+++ b/packages/optimizer/spec/valid-amp/files/Rich_Media_Notifications.html
@@ -36,7 +36,7 @@
   
   <amp-video
     autoplay
-    src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+    src="https://amp-sample-videos.netlify.app/BigBuckBunny.mp4"
     poster="https://peach.blender.org/wp-content/uploads/bbb-splash.png"
     artwork="img/bigbuckbunny.jpg"
     title="Big Buck Bunny"
diff --git a/packages/optimizer/spec/valid-amp/files/amp-ima-video.html b/packages/optimizer/spec/valid-amp/files/amp-ima-video.html
index 32ee8d9e2..fc2c2de2b 100644
--- a/packages/optimizer/spec/valid-amp/files/amp-ima-video.html
+++ b/packages/optimizer/spec/valid-amp/files/amp-ima-video.html
@@ -21,7 +21,7 @@
       width="640" height="360" layout="responsive"
       data-tag="https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator="
       data-poster="https://example.com/img/ima-poster.jpg">
-    <source src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4" type="video/mp4">
+    <source src="https://amp-sample-videos.netlify.app/BigBuckBunny.mp4" type="video/mp4">
   </amp-ima-video>
 
   
@@ -31,7 +31,7 @@
       data-tag="https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpreonlybumper&cmsid=496&vid=short_onecue&correlator="
       data-poster="https://example.com/img/ima-poster.jpg"
       data-ad-label="Publicidad (%s de %s)">
-    <source src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4" type="video/mp4">
+    <source src="https://amp-sample-videos.netlify.app/BigBuckBunny.mp4" type="video/mp4">
   </amp-ima-video>
 
   
@@ -39,7 +39,7 @@
   <amp-ima-video id="myVideo3"
       width="640" height="360" layout="responsive"
       data-tag="https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpreonlybumper&cmsid=496&vid=short_onecue&correlator="
-      data-src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+      data-src="https://amp-sample-videos.netlify.app/BigBuckBunny.mp4"
       data-delay-ad-request="true"
       autoplay>
   </amp-ima-video>
diff --git a/packages/optimizer/spec/valid-amp/files/amp-video.html b/packages/optimizer/spec/valid-amp/files/amp-video.html
index 805082b76..b2354baf6 100644
--- a/packages/optimizer/spec/valid-amp/files/amp-video.html
+++ b/packages/optimizer/spec/valid-amp/files/amp-video.html
@@ -32,7 +32,7 @@
   
   <amp-video width="720" 
              height="405" 
-             src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+             src="https://amp-sample-videos.netlify.app/BigBuckBunny.mp4"
              poster="https://peach.blender.org/wp-content/uploads/bbb-splash.png"
              layout="responsive"
              controls
@@ -60,7 +60,7 @@
   
   <amp-video
     autoplay
-    src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+    src="https://amp-sample-videos.netlify.app/BigBuckBunny.mp4"
     poster="https://peach.blender.org/wp-content/uploads/bbb-splash.png"
     artwork="img/bigbuckbunny.jpg"
     title="Big Buck Bunny"
@@ -75,7 +75,7 @@
   
   
   <amp-video width="720" height="405" 
-                         src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+                         src="https://amp-sample-videos.netlify.app/BigBuckBunny.mp4"
                          poster="https://peach.blender.org/wp-content/uploads/bbb-splash.png"
                          layout="responsive"
                          controls
