diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 08555bc..2cd9340 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -161,7 +161,7 @@
            fi
          done
          ## clean up node
-	 ./voltha down
+	 WAIT_ON_DOWN=y ./voltha down
 	 cd $WORKSPACE/
 	 rm -rf kind-voltha/ voltha-system-tests/ || true
          '''
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index 0d3c9c1..5cc1857 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -93,6 +93,10 @@
              kubectl logs \$pod -n voltha > $WORKSPACE/\$pod.log;
            fi
          done
+         ## clean up node
+         WAIT_ON_DOWN=y ./voltha down
+         cd $WORKSPACE/
+         rm -rf kind-voltha/ voltha-system-tests/ || true
          '''
          step([$class: 'RobotPublisher',
             disableArchiveOutput: false,