diff --git a/scenarios/tests/test_scenario.xml b/scenarios/tests/test_scenario.xml
index 122d88724..3c84e680c 100644
--- a/scenarios/tests/test_scenario.xml
+++ b/scenarios/tests/test_scenario.xml
@@ -4,21 +4,13 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario">
   <system>
-    <system_name>wordpress_2x_stretch</system_name>
+    <system_name>empty_stretch</system_name>
     <base platform="linux" distro="Debian 9" type="server"/>
 
     <input into_datastore="IP_addresses">
       <value>172.16.0.5</value>
-      <value>172.16.0.6</value>
-      <value>172.16.0.7</value>
     </input>
 
-    <vulnerability module_path=".*wordpress_2x.*">
-      <input into="IP_address">
-        <datastore access="0">IP_addresses</datastore>
-      </input>
-    </vulnerability>
-
     <network type="private_network">
       <input into="IP_address">
         <datastore access="0">IP_addresses</datastore>
diff --git a/scenarios/tests/test_scenario_onlinestore.xml b/scenarios/tests/test_scenario_onlinestore.xml
index 5b020807c..c37988328 100644
--- a/scenarios/tests/test_scenario_onlinestore.xml
+++ b/scenarios/tests/test_scenario_onlinestore.xml
@@ -26,8 +26,8 @@
   </system>
 
   <system>
-    <system_name>onlinestore_stretch</system_name>
-    <base platform="linux" distro="Debian 9" type="server"/>
+    <system_name>onlinestore_wheezy</system_name>
+    <base platform="linux" distro="Debian 7.8" type="server"/>
 
     <vulnerability module_path=".*onlinestore.*">
       <input into="IP_address">
diff --git a/scenarios/tests/test_scenario_wp4.xml b/scenarios/tests/test_scenario_wp4.xml
index 201da24d2..2361a77f4 100644
--- a/scenarios/tests/test_scenario_wp4.xml
+++ b/scenarios/tests/test_scenario_wp4.xml
@@ -4,14 +4,12 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario">
   <system>
-    <system_name>wordpress_4x_stretch_https</system_name>
+    <system_name>wp_4x_stretch_https</system_name>
     <base platform="linux" distro="Debian 9" type="server"/>
 
     <input into_datastore="IP_addresses">
       <value>172.16.0.2</value>
       <value>172.16.0.3</value>
-      <value>172.16.0.4</value>
-      <value>172.16.0.5</value>
     </input>
 
     <vulnerability module_path=".*wordpress_4x.*">
@@ -31,10 +29,9 @@
   </system>
 
   <system>
-    <system_name>wordpress_4x_stretch_http</system_name>
+    <system_name>wp_4x_stretch_http</system_name>
     <base platform="linux" distro="Debian 9" type="server"/>
 
-
     <vulnerability module_path=".*wordpress_4x.*">
       <input into="https">
         <value>false</value>