diff --git a/Dockerfile b/Dockerfile
index b9c0e103b2..db2dbf5f48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,6 +38,7 @@ RUN bash -c " \
     if [ $FLAVOR = E2ETEST ] ; then \
 
       ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.CustomerDataCleanup; \
+      if [ $? -ne 0 ] ; then exit 1 ; fi ; \
       ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.BrowserStackInit -PtestType=\"e2e\" executeE2ETests; \
       if [ $? -ne 0 ] ; then exit 1 ; fi ; \
       ./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.MockDataCleanup; \
diff --git a/run-tests.sh b/run-tests.sh
new file mode 100644
index 0000000000..92626e670d
--- /dev/null
+++ b/run-tests.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+./gradlew clean :app:testDevDebugUnitTest --tests com.naviapp.CustomerDataCleanup
+
+if [ $? -eq 0 ]
+then
+  echo "Tests Passed"
+  exit 0
+else
+  echo "Tests Failed"
+  exit 1
+fi
\ No newline at end of file