diff --git a/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java b/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
index de8cf07fc8..91a362deaa 100644
--- a/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
+++ b/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
@@ -143,6 +143,10 @@ public class AutopsyTestCases {
             while (!wo.btNext().isEnabled()) {
                 new Timeout("pausing", 1000).sleep(); // give it a second till the Add Data Source dialog enabled
             }
+
+            // pass by host menu with auto-generate host (which should already be selected)
+            wo.btNext().clickMouse();
+
             //select the toggle button for Disk Image or VM File it will be the first button created and proceed to next panel
             JToggleButtonOperator jtbo = new JToggleButtonOperator(wo, 0);
             jtbo.clickMouse();
@@ -173,6 +177,10 @@ public class AutopsyTestCases {
             while (!wo.btNext().isEnabled()) {
                 new Timeout("pausing", 1000).sleep(); // give it a second till the Add Data Source dialog enabled
             }
+
+            // pass by host menu with auto-generate host (which should already be selected)
+            wo.btNext().clickMouse();
+
             //select the toggle button for Logical Files it will be the third button created and proceed to next panel
             JToggleButtonOperator jtbo = new JToggleButtonOperator(wo, 2);
             jtbo.clickMouse();
@@ -197,6 +205,10 @@ public class AutopsyTestCases {
             while (!wo.btFinish().isEnabled()) {
                 new Timeout("pausing", 1000).sleep(); // give it a second (or five) to process
             }
+
+            // pass by host menu with auto-generate host (which should already be selected)
+            wo.btNext().clickMouse();
+
             logger.log(Level.INFO, "Add image took {0}ms", (System.currentTimeMillis() - start));
             wo.btFinish().clickMouse();
         } catch (TimeoutExpiredException ex) {
@@ -218,6 +230,10 @@ public class AutopsyTestCases {
             while (!wo.btNext().isEnabled()) {
                 new Timeout("pausing", 1000).sleep(); // give it a second till the Add Data Source dialog enabled
             }
+
+            // pass by host menu with auto-generate host (which should already be selected)
+            wo.btNext().clickMouse();
+
             JTableOperator jto = new JTableOperator(wo, 0);
             int row = jto.findCellRow("Hash Lookup", 2, 0);
             jto.clickOnCell(row, 1);
@@ -277,6 +293,10 @@ public class AutopsyTestCases {
             while (!wo.btNext().isEnabled()) {
                 new Timeout("pausing", 1000).sleep(); // give it a second till the Add Data Source dialog enabled
             }
+
+            // pass by host menu with auto-generate host (which should already be selected)
+            wo.btNext().clickMouse();
+
             JTableOperator jto = new JTableOperator(wo, 0);
             int row = jto.findCellRow("Keyword Search", 2, 0);
             jto.clickOnCell(row, 1);
@@ -316,6 +336,10 @@ public class AutopsyTestCases {
             jbo2.pushNoBlock();
             WizardOperator wo = new WizardOperator("Add Data Source");
             new Timeout("pausing", 10000).sleep(); // let things catch up
+
+            // pass by host menu with auto-generate host (which should already be selected)
+            wo.btNext().clickMouse();
+
             wo.btNext().clickMouse();
         } catch (TimeoutExpiredException ex) {
             screenshot("TimeoutScreenshot");