diff --git a/integration-tests/common.bash b/integration-tests/common.bash
index 408c6c298087fefefd3d467b85271eee148feb94..8852c0ec2fae5b92b7d7693fbc77fa91fc444f5a 100755
--- a/integration-tests/common.bash
+++ b/integration-tests/common.bash
@@ -436,8 +436,11 @@ function install_datamovers {
 
 function restart_openbis {
     assert_dir_exists_or_die $OPENBIS_SERVER
-    shutdown_openbis_server
-    sleep 1
+    if [ "`check_server_port`" != "" ]; then
+    	echo Shutting down openbis server.
+	    shutdown_openbis_server
+	    sleep 1
+  	fi
     startup_openbis_server
     sleep 4
 }