diff --git a/__tests__/html/avatar.emptyInitials.js b/__tests__/html/avatar.emptyInitials.js
deleted file mode 100644
index 385a66e0ec..0000000000
--- a/__tests__/html/avatar.emptyInitials.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('Avatar', () => {
-  test('with empty initials should leave gutter space', () => runHTML('avatar.emptyInitials.html'));
-});
diff --git a/__tests__/html/avatar.undefinedInitials.js b/__tests__/html/avatar.undefinedInitials.js
deleted file mode 100644
index c2e428e3ef..0000000000
--- a/__tests__/html/avatar.undefinedInitials.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('Avatar', () => {
-  test('with undefined initials should not leave gutter space', () => runHTML('avatar.undefinedInitials.html'));
-});
diff --git a/__tests__/html/cardAction.adaptiveCard.cardAgenda.js b/__tests__/html/cardAction.adaptiveCard.cardAgenda.js
deleted file mode 100644
index 0504d75496..0000000000
--- a/__tests__/html/cardAction.adaptiveCard.cardAgenda.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('"Adaptive card', () => {
-  test('card agenda with schema 1.3 should pass', () => runHTML('cardAction.adaptiveCard.cardAgenda.html'));
-});
diff --git a/__tests__/html/cardAction.adaptiveCard.cardAgendaTranscript.js b/__tests__/html/cardAction.adaptiveCard.cardAgendaTranscript.js
deleted file mode 100644
index c86ced7568..0000000000
--- a/__tests__/html/cardAction.adaptiveCard.cardAgendaTranscript.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('"Adaptive card', () => {
-  test('schema 1.3', () => runHTML('cardAction.adaptiveCard.cardAgendaTranscript.html'));
-});
diff --git a/__tests__/html/cardAction.adaptiveCard.disallowedScheme.js b/__tests__/html/cardAction.adaptiveCard.disallowedScheme.js
deleted file mode 100644
index 953d582004..0000000000
--- a/__tests__/html/cardAction.adaptiveCard.disallowedScheme.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('"openUrl" action on Adaptive Card', () => {
-  test('with a disallowed scheme should not open', () => runHTML('cardAction.adaptiveCard.disallowedScheme.html'));
-});
diff --git a/__tests__/html/cardAction.adaptiveCard.openURL.js b/__tests__/html/cardAction.adaptiveCard.openURL.js
deleted file mode 100644
index d423a5ca35..0000000000
--- a/__tests__/html/cardAction.adaptiveCard.openURL.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('"openUrl" action on Adaptive Card', () => {
-  test('should open URL in a new tab with "noopener" and "noreferrer"', () =>
-    runHTML('cardAction.adaptiveCard.openURL.html'));
-});
diff --git a/__tests__/html/cardAction.adaptiveCard.parseValidation.js b/__tests__/html/cardAction.adaptiveCard.parseValidation.js
deleted file mode 100644
index c4e2700567..0000000000
--- a/__tests__/html/cardAction.adaptiveCard.parseValidation.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('"Adaptive card', () => {
-  test('parsing error', () => runHTML('cardAction.adaptiveCard.parseValidation.html'));
-});
diff --git a/__tests__/html/cardAction.heroCard.disallowedScheme.js b/__tests__/html/cardAction.heroCard.disallowedScheme.js
deleted file mode 100644
index b712ac474d..0000000000
--- a/__tests__/html/cardAction.heroCard.disallowedScheme.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('"openUrl" action on hero card', () => {
-  test('with a disallowed scheme should not open', () => runHTML('cardAction.heroCard.disallowedScheme.html'));
-});
diff --git a/__tests__/html/cardAction.heroCard.openURL.js b/__tests__/html/cardAction.heroCard.openURL.js
deleted file mode 100644
index 4b00dffd81..0000000000
--- a/__tests__/html/cardAction.heroCard.openURL.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('"openUrl" action on hero card', () => {
-  test('should open URL in a new tab with "noopener" and "noreferrer"', () =>
-    runHTML('cardAction.heroCard.openURL.html'));
-});
diff --git a/__tests__/html/avatar.emptyInitials.html b/__tests__/html2/avatar/emptyInitials.html
similarity index 98%
rename from __tests__/html/avatar.emptyInitials.html
rename to __tests__/html2/avatar/emptyInitials.html
index 9b7c42095c..5047f63079 100644
--- a/__tests__/html/avatar.emptyInitials.html
+++ b/__tests__/html2/avatar/emptyInitials.html
@@ -94,7 +94,7 @@
 
         await pageConditions.uiConnected();
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/avatar-empty-initials-js-avatar-with-empty-initials-should-leave-gutter-space-1-snap.png b/__tests__/html2/avatar/emptyInitials.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/avatar-empty-initials-js-avatar-with-empty-initials-should-leave-gutter-space-1-snap.png
rename to __tests__/html2/avatar/emptyInitials.html.snap-1.png
diff --git a/__tests__/html/avatar.undefinedInitials.html b/__tests__/html2/avatar/undefinedInitials.html
similarity index 98%
rename from __tests__/html/avatar.undefinedInitials.html
rename to __tests__/html2/avatar/undefinedInitials.html
index daf87d2079..bc723f40f3 100644
--- a/__tests__/html/avatar.undefinedInitials.html
+++ b/__tests__/html2/avatar/undefinedInitials.html
@@ -80,7 +80,7 @@
 
         await pageConditions.uiConnected();
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/avatar-undefined-initials-js-avatar-with-undefined-initials-should-not-leave-gutter-space-1-snap.png b/__tests__/html2/avatar/undefinedInitials.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/avatar-undefined-initials-js-avatar-with-undefined-initials-should-not-leave-gutter-space-1-snap.png
rename to __tests__/html2/avatar/undefinedInitials.html.snap-1.png
diff --git a/__tests__/html/cardAction.adaptiveCard.cardAgenda.html b/__tests__/html2/cardAction/adaptiveCard.cardAgenda.html
similarity index 96%
rename from __tests__/html/cardAction.adaptiveCard.cardAgenda.html
rename to __tests__/html2/cardAction/adaptiveCard.cardAgenda.html
index 31bcaeab47..deea0d67fb 100644
--- a/__tests__/html/cardAction.adaptiveCard.cardAgenda.html
+++ b/__tests__/html2/cardAction/adaptiveCard.cardAgenda.html
@@ -22,7 +22,7 @@
         await pageObjects.sendMessageViaSendBox('card agenda', { waitForSend: true });
         await pageConditions.minNumActivitiesShown(2);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-js-adaptive-card-card-agenda-with-schema-1-3-should-pass-1-snap.png b/__tests__/html2/cardAction/adaptiveCard.cardAgenda.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-js-adaptive-card-card-agenda-with-schema-1-3-should-pass-1-snap.png
rename to __tests__/html2/cardAction/adaptiveCard.cardAgenda.html.snap-1.png
diff --git a/__tests__/html/cardAction.adaptiveCard.cardAgendaTranscript.html b/__tests__/html2/cardAction/adaptiveCard.cardAgendaTranscript.html
similarity index 99%
rename from __tests__/html/cardAction.adaptiveCard.cardAgendaTranscript.html
rename to __tests__/html2/cardAction/adaptiveCard.cardAgendaTranscript.html
index c2e9833492..11a14e958a 100644
--- a/__tests__/html/cardAction.adaptiveCard.cardAgendaTranscript.html
+++ b/__tests__/html2/cardAction/adaptiveCard.cardAgendaTranscript.html
@@ -316,7 +316,7 @@
           await pageConditions.uiConnected();
           await pageConditions.minNumActivitiesShown(1);
 
-          await host.snapshot();
+          await host.snapshot('local');
         },
         { ignoreErrors: true }
       );
diff --git a/__tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-transcript-js-adaptive-card-schema-1-3-1-snap.png b/__tests__/html2/cardAction/adaptiveCard.cardAgendaTranscript.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/card-action-adaptive-card-card-agenda-transcript-js-adaptive-card-schema-1-3-1-snap.png
rename to __tests__/html2/cardAction/adaptiveCard.cardAgendaTranscript.html.snap-1.png
diff --git a/__tests__/html/cardAction.adaptiveCard.disallowedScheme.html b/__tests__/html2/cardAction/adaptiveCard.disallowedScheme.html
similarity index 100%
rename from __tests__/html/cardAction.adaptiveCard.disallowedScheme.html
rename to __tests__/html2/cardAction/adaptiveCard.disallowedScheme.html
diff --git a/__tests__/html/cardAction.adaptiveCard.openURL.html b/__tests__/html2/cardAction/adaptiveCard.openURL.html
similarity index 100%
rename from __tests__/html/cardAction.adaptiveCard.openURL.html
rename to __tests__/html2/cardAction/adaptiveCard.openURL.html
diff --git a/__tests__/html/cardAction.adaptiveCard.parseValidation.html b/__tests__/html2/cardAction/adaptiveCard.parseValidation.html
similarity index 98%
rename from __tests__/html/cardAction.adaptiveCard.parseValidation.html
rename to __tests__/html2/cardAction/adaptiveCard.parseValidation.html
index cb567dceb2..b393d740b5 100644
--- a/__tests__/html/cardAction.adaptiveCard.parseValidation.html
+++ b/__tests__/html2/cardAction/adaptiveCard.parseValidation.html
@@ -63,7 +63,7 @@
         await pageConditions.uiConnected();
         await pageConditions.minNumActivitiesShown(1);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/card-action-adaptive-card-parse-validation-js-adaptive-card-parsing-error-1-snap.png b/__tests__/html2/cardAction/adaptiveCard.parseValidation.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/card-action-adaptive-card-parse-validation-js-adaptive-card-parsing-error-1-snap.png
rename to __tests__/html2/cardAction/adaptiveCard.parseValidation.html.snap-1.png
diff --git a/__tests__/html/cardAction.heroCard.openURL.html b/__tests__/html2/cardAction/cardAction.heroCard.openURL.html
similarity index 100%
rename from __tests__/html/cardAction.heroCard.openURL.html
rename to __tests__/html2/cardAction/cardAction.heroCard.openURL.html
diff --git a/__tests__/html/cardAction.heroCard.disallowedScheme.html b/__tests__/html2/cardAction/disallowedScheme.html
similarity index 100%
rename from __tests__/html/cardAction.heroCard.disallowedScheme.html
rename to __tests__/html2/cardAction/disallowedScheme.html