diff --git a/e2e-commons/up.sh b/e2e-commons/up.sh
index 88d1b371..fe1ea8e2 100755
--- a/e2e-commons/up.sh
+++ b/e2e-commons/up.sh
@@ -24,6 +24,18 @@ while [ "$1" != "" ]; do
 
   if [ "$1" == "ui" ]; then
     docker-compose up -d ui ui-erc20 ui-erc20-native
+
+    docker-compose run -d -p 3000:3000 ui yarn workspace ui run start
+    docker-compose run -d -p 3001:3000 ui-erc20 yarn workspace ui run start
+    docker-compose run -d -p 3002:3000 ui-erc20-native yarn workspace ui run start
+  fi
+
+  if [ "$1" == "oracle-deploy" ]; then
+    docker-compose run e2e yarn workspace oracle-e2e run deploy
+  fi
+
+  if [ "$1" == "ui-deploy" ]; then
+    docker-compose run e2e yarn workspace ui-e2e run deploy
   fi
 
   shift # Shift all the parameters down by one
diff --git a/oracle-e2e/run-tests.sh b/oracle-e2e/run-tests.sh
index 28f20d88..1b7ff898 100755
--- a/oracle-e2e/run-tests.sh
+++ b/oracle-e2e/run-tests.sh
@@ -1,8 +1,6 @@
 cd $(dirname $0)
 
-../e2e-commons/up.sh oracle
-
-docker-compose -f ../e2e-commons/docker-compose.yml run e2e yarn workspace oracle-e2e run deploy
+../e2e-commons/up.sh oracle oracle-deploy
 
 docker-compose -f ../e2e-commons/docker-compose.yml run e2e yarn workspace oracle-e2e run start
 rc=$?
diff --git a/ui-e2e/run-tests.sh b/ui-e2e/run-tests.sh
index fb470b50..67ec32fb 100755
--- a/ui-e2e/run-tests.sh
+++ b/ui-e2e/run-tests.sh
@@ -1,30 +1,12 @@
 #!/usr/bin/env bash
 cd $(dirname $0)
 
-docker-compose down
-docker-compose up -d --build --force-recreate
+../e2e-commons/up.sh oracle ui ui-deploy
+
 node ./scripts/blocks.js &
-
-docker-compose run e2e yarn workspace ui-e2e run deploy
-docker-compose run -d bridge yarn watcher:signature-request
-docker-compose run -d bridge yarn watcher:collected-signatures
-docker-compose run -d bridge yarn watcher:affirmation-request
-docker-compose run -d bridge-erc20 yarn watcher:signature-request
-docker-compose run -d bridge-erc20 yarn watcher:collected-signatures
-docker-compose run -d bridge-erc20 yarn watcher:affirmation-request
-docker-compose run -d bridge-erc20-native yarn watcher:signature-request
-docker-compose run -d bridge-erc20-native yarn watcher:collected-signatures
-docker-compose run -d bridge-erc20-native yarn watcher:affirmation-request
-docker-compose run -d bridge yarn sender:home
-docker-compose run -d bridge yarn sender:foreign
-docker-compose run -d -p 3000:3000 ui yarn workspace ui run start
-docker-compose run -d -p 3001:3000 ui-erc20 yarn workspace ui run start
-docker-compose run -d -p 3002:3000 ui-erc20-native yarn workspace ui run start
-
 yarn mocha -b ./test.js
 rc=$?
 if [ $CI ]; then exit $rc; fi
 
-ps | grep node | grep -v grep | awk '{print "kill " $1}' | sh
-docker-compose down
+../e2e-commons/down.sh
 exit $rc