diff --git a/tools/test/bin/stc b/tools/test/bin/stc
index e088af7233..9c5702f5ad 100755
--- a/tools/test/bin/stc
+++ b/tools/test/bin/stc
@@ -5,7 +5,7 @@
 
 . $ONOS_ROOT/tools/build/envDefaults
 
-VER=${STC_VERSION:-2.4}
+VER=${STC_VERSION:-2.5}
 MVN_JAR=org/onosproject/onos-stc/$VER/onos-stc-$VER.jar
 JAR=${MAVEN_REPO:-$HOME/.m2/repository}/$MVN_JAR
 SCENARIOS=$ONOS_ROOT/tools/test/scenarios
diff --git a/tools/test/scenarios/archetypes.xml b/tools/test/scenarios/archetypes.xml
index 17faab3b72..4a49940692 100644
--- a/tools/test/scenarios/archetypes.xml
+++ b/tools/test/scenarios/archetypes.xml
@@ -27,8 +27,7 @@
             requires="Install-App" delay="5" >
             <parallel var="${OC#}">
                 <step name="Verify-App-${#}"
-                      exec="onos ${OC#} scr:details org.test.app.AppComponent"
-                      FIXME="onos-check-components ${OC#} org.test.app.AppComponent"/>
+                      exec="onos ${OC#} scr:details org.test.app.AppComponent"/>
             </parallel>
         </group>
 
diff --git a/tools/test/scenarios/net-teardown.xml b/tools/test/scenarios/net-teardown.xml
index 9b4c3092fc..f4777ac634 100644
--- a/tools/test/scenarios/net-teardown.xml
+++ b/tools/test/scenarios/net-teardown.xml
@@ -17,6 +17,8 @@
     <group name="Net-Teardown">
         <step name="Stop-Mininet" exec="onos-mininet stop"/>
         <step name="Cleanup-Mininet" exec="onos-mininet cleanup" requires="~Stop-Mininet"/>
-        <XXXstep name="Wipe-Out-Data-After" requires="~Stop-Mininet" exec="onos-wipe-out"/>
+        <!--
+        <step name="Wipe-Out-Data-After" requires="~Stop-Mininet" exec="onos-wipe-out"/>
+        -->
     </group>
 </scenario>
\ No newline at end of file