diff --git a/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.js b/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.js
index 684c99c4b9e..cc7fa979914 100644
--- a/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.js
+++ b/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.js
@@ -16,7 +16,8 @@ function integrityTest(integrityOptions, stories2snapsConverter) {
         const possibleStoriesFiles = stories2snapsConverter.getPossibleStoriesFiles(fileName);
         return !possibleStoriesFiles.some(fs.existsSync);
       });
-      expect(abandonedStoryshots.length).toBe(0);
+
+      expect(abandonedStoryshots).toEqual([]);
     });
   });
 }
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/addon-a11y.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/addon-a11y.stories.storyshot
deleted file mode 100644
index 8c979f07574..00000000000
--- a/examples/html-kitchen-sink/stories/__snapshots__/addon-a11y.stories.storyshot
+++ /dev/null
@@ -1,27 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Addons|a11y Default 1`] = `<button />`;
-
-exports[`Storyshots Addons|a11y Delayed render 1`] = `<div />`;
-
-exports[`Storyshots Addons|a11y Disabled 1`] = `
-<button
-  disabled=""
->
-  Testing the a11y addon
-</button>
-`;
-
-exports[`Storyshots Addons|a11y Invalid contrast 1`] = `
-<button
-  style="color: black; background-color: brown;"
->
-  Testing the a11y addon
-</button>
-`;
-
-exports[`Storyshots Addons|a11y Label 1`] = `
-<button>
-  Testing the a11y addon
-</button>
-`;
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/addon-actions.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/addon-actions.stories.storyshot
deleted file mode 100644
index b5a33580d65..00000000000
--- a/examples/html-kitchen-sink/stories/__snapshots__/addon-actions.stories.storyshot
+++ /dev/null
@@ -1,62 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Addons|Actions Decorated actions + config 1`] = `
-<button
-  type="button"
->
-  Hello World
-</button>
-`;
-
-exports[`Storyshots Addons|Actions Decorated actions 1`] = `
-<button
-  type="button"
->
-  Hello World
-</button>
-`;
-
-exports[`Storyshots Addons|Actions Hello World 1`] = `
-<button
-  type="button"
->
-  Hello World
-</button>
-`;
-
-exports[`Storyshots Addons|Actions Multiple actions + config 1`] = `
-<button
-  type="button"
->
-  Hello World
-</button>
-`;
-
-exports[`Storyshots Addons|Actions Multiple actions 1`] = `
-<button
-  type="button"
->
-  Hello World
-</button>
-`;
-
-exports[`Storyshots Addons|Actions Multiple actions, object + config 1`] = `
-<button
-  type="button"
->
-  Hello World
-</button>
-`;
-
-exports[`Storyshots Addons|Actions Multiple actions, object 1`] = `
-<button
-  type="button"
->
-  Hello World
-</button>
-`;
-
-exports[`Storyshots Addons|Actions Multiple actions, selector 1`] = `
-
-        
-`;
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/addon-backgrounds.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/addon-backgrounds.stories.storyshot
deleted file mode 100644
index 211e0b45345..00000000000
--- a/examples/html-kitchen-sink/stories/__snapshots__/addon-backgrounds.stories.storyshot
+++ /dev/null
@@ -1,17 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Addons|Backgrounds story 1 1`] = `
-<span
-  style="color: white"
->
-  You should be able to switch backgrounds for this story
-</span>
-`;
-
-exports[`Storyshots Addons|Backgrounds story 2 1`] = `
-<span
-  style="color: white"
->
-  This one too!
-</span>
-`;
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/addon-centered.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/addon-centered.stories.storyshot
deleted file mode 100644
index 681a29fffda..00000000000
--- a/examples/html-kitchen-sink/stories/__snapshots__/addon-centered.stories.storyshot
+++ /dev/null
@@ -1,17 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Addons|Centered button in center 1`] = `
-<div
-  id="sb-addon-centered-wrapper"
-  style="position: fixed; top: 0px; left: 0px; bottom: 0px; right: 0px; display: flex; align-items: center; overflow: auto;"
->
-  <div
-    id="sb-addon-centered-inner"
-    style="margin: auto; max-height: 100%;"
-  >
-    <button>
-      I am a Button !
-    </button>
-  </div>
-</div>
-`;
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/addon-events.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/addon-events.stories.storyshot
deleted file mode 100644
index 84466dd440a..00000000000
--- a/examples/html-kitchen-sink/stories/__snapshots__/addon-events.stories.storyshot
+++ /dev/null
@@ -1,6 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Addons|Events Logger 1`] = `
-
-      
-`;
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/addon-jest.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/addon-jest.stories.storyshot
deleted file mode 100644
index 7c83d5b812b..00000000000
--- a/examples/html-kitchen-sink/stories/__snapshots__/addon-jest.stories.storyshot
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Addons|Jest withTests 1`] = `This story shows test results`;
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/addon-knobs.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/addon-knobs.stories.storyshot
deleted file mode 100644
index 7a21a63b844..00000000000
--- a/examples/html-kitchen-sink/stories/__snapshots__/addon-knobs.stories.storyshot
+++ /dev/null
@@ -1,70 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Addons|Knobs All knobs 1`] = `
-<div
-  style="border: 2px dotted deeppink; padding: 8px 22px; border-radius: 8px"
->
-  
-        
-  <h1>
-    My name is Jane,
-  </h1>
-  
-        
-  <h3>
-    today is January 20, 2017
-  </h3>
-  
-        
-  <p>
-    I have a stock of 20 apples, costing $2.25 each.
-  </p>
-  
-        
-  <p>
-    Also, I have:
-  </p>
-  
-        
-  <ul>
-    <li>
-      Laptop
-    </li>
-    <li>
-      Book
-    </li>
-    <li>
-      Whiskey
-    </li>
-  </ul>
-  
-        
-  <p>
-    Nice to meet you!
-  </p>
-  
-      
-</div>
-`;
-
-exports[`Storyshots Addons|Knobs CSS transitions 1`] = `
-<p
-  style="transition: color 0.5s ease-out; color: orangered;"
->
-  John Doe
-</p>
-`;
-
-exports[`Storyshots Addons|Knobs DOM 1`] = `
-<p>
-  John Doe
-</p>
-`;
-
-exports[`Storyshots Addons|Knobs Simple 1`] = `
-<div>
-  I am John Doe and I'm 44 years old.
-</div>
-`;
-
-exports[`Storyshots Addons|Knobs XSS safety 1`] = `&lt;img src=x onerror="alert('XSS Attack')" &gt;`;
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/addon-notes.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/addon-notes.stories.storyshot
deleted file mode 100644
index b7b58fa7bad..00000000000
--- a/examples/html-kitchen-sink/stories/__snapshots__/addon-notes.stories.storyshot
+++ /dev/null
@@ -1,15 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Addons|Notes Simple note 1`] = `
-<p>
-  
-        
-  <strong>
-    
-          This is a fragment of HTML
-        
-  </strong>
-  
-      
-</p>
-`;
diff --git a/examples/html-kitchen-sink/stories/__snapshots__/index.stories.storyshot b/examples/html-kitchen-sink/stories/__snapshots__/welcome.stories.storyshot
similarity index 80%
rename from examples/html-kitchen-sink/stories/__snapshots__/index.stories.storyshot
rename to examples/html-kitchen-sink/stories/__snapshots__/welcome.stories.storyshot
index 9fc15594022..8b68425a1ea 100644
--- a/examples/html-kitchen-sink/stories/__snapshots__/index.stories.storyshot
+++ b/examples/html-kitchen-sink/stories/__snapshots__/welcome.stories.storyshot
@@ -1,34 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Demo button 1`] = `
-<button>
-  Hello Button
-</button>
-`;
-
-exports[`Storyshots Demo heading 1`] = `
-<h1>
-  Hello World
-</h1>
-`;
-
-exports[`Storyshots Demo headings 1`] = `
-<section>
-  <h1>
-    Hello World
-  </h1>
-  <h2>
-    Hello World
-  </h2>
-  <h3>
-    Hello World
-  </h3>
-  <h4>
-    Hello World
-  </h4>
-</section>
-`;
-
 exports[`Storyshots Welcome Welcome 1`] = `
 <div
   class="main"
diff --git a/examples/html-kitchen-sink/tests/__snapshots__/htmlshots.test.js.snap b/examples/html-kitchen-sink/tests/__snapshots__/htmlshots.test.js.snap
new file mode 100644
index 00000000000..c98dd02e70d
--- /dev/null
+++ b/examples/html-kitchen-sink/tests/__snapshots__/htmlshots.test.js.snap
@@ -0,0 +1,239 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addons|Actions Decorated actions + config 1`] = `
+<button
+  type="button"
+>
+  Hello World
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Decorated actions 1`] = `
+<button
+  type="button"
+>
+  Hello World
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Hello World 1`] = `
+<button
+  type="button"
+>
+  Hello World
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Multiple actions + config 1`] = `
+<button
+  type="button"
+>
+  Hello World
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Multiple actions 1`] = `
+<button
+  type="button"
+>
+  Hello World
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Multiple actions, object + config 1`] = `
+<button
+  type="button"
+>
+  Hello World
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Multiple actions, object 1`] = `
+<button
+  type="button"
+>
+  Hello World
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Multiple actions, selector 1`] = `
+
+        
+`;
+
+exports[`Storyshots Addons|Backgrounds story 1 1`] = `
+<span
+  style="color: white"
+>
+  You should be able to switch backgrounds for this story
+</span>
+`;
+
+exports[`Storyshots Addons|Backgrounds story 2 1`] = `
+<span
+  style="color: white"
+>
+  This one too!
+</span>
+`;
+
+exports[`Storyshots Addons|Centered button in center 1`] = `
+<div
+  id="sb-addon-centered-wrapper"
+  style="position: fixed; top: 0px; left: 0px; bottom: 0px; right: 0px; display: flex; align-items: center; overflow: auto;"
+>
+  <div
+    id="sb-addon-centered-inner"
+    style="margin: auto; max-height: 100%;"
+  >
+    <button>
+      I am a Button !
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Storyshots Addons|Events Logger 1`] = `
+
+  
+`;
+
+exports[`Storyshots Addons|Jest withTests 1`] = `This story shows test results`;
+
+exports[`Storyshots Addons|Knobs All knobs 1`] = `
+<div
+  style="border: 2px dotted deeppink; padding: 8px 22px; border-radius: 8px"
+>
+  
+        
+  <h1>
+    My name is Jane,
+  </h1>
+  
+        
+  <h3>
+    today is January 20, 2017
+  </h3>
+  
+        
+  <p>
+    I have a stock of 20 apples, costing $2.25 each.
+  </p>
+  
+        
+  <p>
+    Also, I have:
+  </p>
+  
+        
+  <ul>
+    <li>
+      Laptop
+    </li>
+    <li>
+      Book
+    </li>
+    <li>
+      Whiskey
+    </li>
+  </ul>
+  
+        
+  <p>
+    Nice to meet you!
+  </p>
+  
+      
+</div>
+`;
+
+exports[`Storyshots Addons|Knobs CSS transitions 1`] = `
+<p
+  style="transition: color 0.5s ease-out; color: orangered;"
+>
+  John Doe
+</p>
+`;
+
+exports[`Storyshots Addons|Knobs DOM 1`] = `
+<p>
+  John Doe
+</p>
+`;
+
+exports[`Storyshots Addons|Knobs Simple 1`] = `
+<div>
+  I am John Doe and I'm 44 years old.
+</div>
+`;
+
+exports[`Storyshots Addons|Knobs XSS safety 1`] = `&lt;img src=x onerror="alert('XSS Attack')" &gt;`;
+
+exports[`Storyshots Addons|Notes Simple note 1`] = `
+<p>
+  
+      
+  <strong>
+    
+        This is a fragment of HTML
+      
+  </strong>
+  
+    
+</p>
+`;
+
+exports[`Storyshots Addons|a11y Default 1`] = `<button />`;
+
+exports[`Storyshots Addons|a11y Delayed render 1`] = `<div />`;
+
+exports[`Storyshots Addons|a11y Disabled 1`] = `
+<button
+  disabled=""
+>
+  Testing the a11y addon
+</button>
+`;
+
+exports[`Storyshots Addons|a11y Invalid contrast 1`] = `
+<button
+  style="color: black; background-color: brown;"
+>
+  Testing the a11y addon
+</button>
+`;
+
+exports[`Storyshots Addons|a11y Label 1`] = `
+<button>
+  Testing the a11y addon
+</button>
+`;
+
+exports[`Storyshots Demo button 1`] = `
+<button>
+  Hello Button
+</button>
+`;
+
+exports[`Storyshots Demo heading 1`] = `
+<h1>
+  Hello World
+</h1>
+`;
+
+exports[`Storyshots Demo headings 1`] = `
+<section>
+  <h1>
+    Hello World
+  </h1>
+  <h2>
+    Hello World
+  </h2>
+  <h3>
+    Hello World
+  </h3>
+  <h4>
+    Hello World
+  </h4>
+</section>
+`;