diff --git a/test/run_test b/test/run_test
index c560434c..a3269624 100755
--- a/test/run_test
+++ b/test/run_test
@@ -634,10 +634,12 @@ $volume_options
 
   echo "  Changing passwords"
 
-  # create separate mounting directory for second container, as selinux does
-  # not allow two containers accesing one mounting directory if mounted with
-  # Z option
-  create_volume_dir || ret=1
+  echo "Kill the previous container and create a new one"
+  local cidfile=$CID_FILE_DIR/"${name}"
+  docker kill $(cat $cidfile)
+  docker rm -f $(cat $cidfile)
+  # Don't forget to remove its .cid file
+  rm $cidfile
 
   DOCKER_ARGS="
 -e POSTGRESQL_DATABASE=${database}