diff --git a/test/screenshot/golden.json b/test/screenshot/golden.json
index 1618739d6ff..58a1de585c4 100644
--- a/test/screenshot/golden.json
+++ b/test/screenshot/golden.json
@@ -184,11 +184,11 @@
     }
   },
   "spec/mdc-checkbox/classes/baseline.html": {
-    "public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/15/20_30_12_828/spec/mdc-checkbox/classes/baseline.html?utm_source=golden_json",
+    "public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/21/18_29_09_183/spec/mdc-checkbox/classes/baseline.html?utm_source=golden_json",
     "screenshots": {
-      "desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/15/16_09_10_398/spec/mdc-checkbox/classes/baseline.html.windows_chrome_74.png",
-      "desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/15/20_30_12_828/spec/mdc-checkbox/classes/baseline.html.windows_firefox_65.png",
-      "desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/15/16_09_10_398/spec/mdc-checkbox/classes/baseline.html.windows_ie_11.png"
+      "desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/21/18_29_09_183/spec/mdc-checkbox/classes/baseline.html.windows_chrome_74.png",
+      "desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/21/18_29_09_183/spec/mdc-checkbox/classes/baseline.html.windows_firefox_65.png",
+      "desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/21/18_29_09_183/spec/mdc-checkbox/classes/baseline.html.windows_ie_11.png"
     }
   },
   "spec/mdc-checkbox/mixins/container-colors.html": {
@@ -200,10 +200,10 @@
     }
   },
   "spec/mdc-checkbox/mixins/touch-dimension.html": {
-    "public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/20/17_56_10_840/spec/mdc-checkbox/mixins/touch-dimension.html?utm_source=golden_json",
+    "public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/21/18_29_09_183/spec/mdc-checkbox/mixins/touch-dimension.html?utm_source=golden_json",
     "screenshots": {
       "desktop_windows_chrome@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/13/19_16_33_458/spec/mdc-checkbox/mixins/touch-dimension.html.windows_chrome_74.png",
-      "desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/20/17_56_10_840/spec/mdc-checkbox/mixins/touch-dimension.html.windows_firefox_65.png",
+      "desktop_windows_firefox@latest": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/21/18_29_09_183/spec/mdc-checkbox/mixins/touch-dimension.html.windows_firefox_65.png",
       "desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/15/16_09_10_398/spec/mdc-checkbox/mixins/touch-dimension.html.windows_ie_11.png"
     }
   },
diff --git a/test/screenshot/spec/mdc-checkbox/classes/baseline.html b/test/screenshot/spec/mdc-checkbox/classes/baseline.html
index 6c0f5244ba0..02f3655fcbf 100644
--- a/test/screenshot/spec/mdc-checkbox/classes/baseline.html
+++ b/test/screenshot/spec/mdc-checkbox/classes/baseline.html
@@ -46,7 +46,7 @@
           <div class="mdc-checkbox">
             <input type="checkbox"
                    class="mdc-checkbox__native-control"
-                   id="checkbox-unchecked"/>
+                   id="checkbox-unchecked" autofocus/>
             <div class="mdc-checkbox__background">
               <svg class="mdc-checkbox__checkmark"
                    viewBox="0 0 24 24">
@@ -64,7 +64,7 @@
             <input type="checkbox"
                    checked
                    class="mdc-checkbox__native-control"
-                   id="checkbox-checked" autofocus />
+                   id="checkbox-checked" />
             <div class="mdc-checkbox__background">
               <svg class="mdc-checkbox__checkmark"
                    viewBox="0 0 24 24">