diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
index 3d6aef0cdf..16f31afa20 100644
--- a/hack/jenkins/linux_integration_tests_none.sh
+++ b/hack/jenkins/linux_integration_tests_none.sh
@@ -33,9 +33,5 @@ EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS --use-vendored-driver"
 SUDO_PREFIX="sudo -E "
 export KUBECONFIG="/root/.kube/config"
 
-# Clean up running docker containers on the test slave
-docker stop $(docker ps -aq) || true
-docker rm $(docker ps -aq) || true
-
 # Download files and set permissions
 source common.sh
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 1f9a8936f5..d4adf72d36 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -31,6 +31,8 @@ import (
 )
 
 const driverName = "none"
+const dockerkillcmd = `docker rm $(docker kill $(docker ps -a --filter="name=k8s_" --format="{{.ID}}"))`
+const dockerstopcmd = `docker stop $(docker ps -a --filter="name=k8s_" --format="{{.ID}}")`
 
 // none Driver is a driver designed to run localkube w/o a VM
 type Driver struct {
@@ -132,7 +134,10 @@ func (d *Driver) Remove() error {
 	cmd = exec.Command("sudo", "rm", "-rf", "/var/lib/localkube")
 	if err := cmd.Start(); err != nil {
 		return errors.Wrap(err, "removing localkube")
+
 	}
+	runCommand(dockerkillcmd, false)
+
 	return nil
 }
 
@@ -160,7 +165,7 @@ else
 	sudo kill $(cat %s)
 fi
 `, constants.LocalkubePIDPath)
-	_, err := runCommand(stopcmd, true)
+	_, err := runCommand(stopcmd, false)
 	if err != nil {
 		return err
 	}
@@ -173,6 +178,7 @@ fi
 			break
 		}
 	}
+	runCommand(dockerstopcmd, false)
 	return nil
 }