diff --git a/tests/ui/docker-compose.test.yml b/tests/ui/docker-compose.test.yml
new file mode 100644
index 000000000..acb7e41a8
--- /dev/null
+++ b/tests/ui/docker-compose.test.yml
@@ -0,0 +1,20 @@
+version: "3.5"
+
+services:
+  ui-tests:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    environment:
+      - PYTHONUNBUFFERED=1
+    extra_hosts:
+      - "www.example.com:192.168.0.2"
+      - "app1.example.com:192.168.0.2"
+    networks:
+      bw-services:
+        ipv4_address: 192.168.0.3
+
+networks:
+  bw-services:
+    external:
+      name: bw-services
diff --git a/tests/ui/tests.sh b/tests/ui/tests.sh
index 9cfdae627..07dd9e0d1 100755
--- a/tests/ui/tests.sh
+++ b/tests/ui/tests.sh
@@ -19,9 +19,6 @@ if [ $? -ne 0 ] ; then
     echo "❌ Up failed"
     exit 1
 fi
-
-docker-compose stop ui-tests
-
 i=0
 while [ $i -lt 120 ] ; do
     containers=("ui_bw_1" "ui_bw-scheduler_1" "ui_bw-ui_1")
@@ -47,7 +44,12 @@ if [ $i -ge 120 ] ; then
 fi
 
 # Start tests
-docker-compose start ui-tests
+docker-compose -f docker-compose.test.yml build
+if [ $? -ne 0 ] ; then
+    echo "❌ Build failed"
+    exit 1
+fi
+docker-compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from ui-tests
 
 # Exit
 exit $?
\ No newline at end of file