diff --git a/cyphernodeconf_docker/prompters/999_installer.js b/cyphernodeconf_docker/prompters/999_installer.js
index 11b7ffe..1d3ca18 100644
--- a/cyphernodeconf_docker/prompters/999_installer.js
+++ b/cyphernodeconf_docker/prompters/999_installer.js
@@ -302,8 +302,8 @@ module.exports = {
   },
   templates: function( props ) {
     if( props.installer_mode === 'docker' ) {
-      return ['config.sh','start.sh', 'stop.sh', 'testfeatures.sh', path.join('docker', 'docker-compose.yaml')];
+      return ['config.sh','start.sh', 'stop.sh', 'testfeatures.sh', 'testdeployment.sh', path.join('docker', 'docker-compose.yaml')];
     }
-    return ['config.sh','start.sh', 'stop.sh', 'testfeatures.sh'];
+    return ['config.sh','start.sh', 'stop.sh', 'testfeatures.sh', 'testdeployment.sh'];
   }
 };
diff --git a/cyphernodeconf_docker/templates/installer/start.sh b/cyphernodeconf_docker/templates/installer/start.sh
index fb9c225..dbc0b74 100644
--- a/cyphernodeconf_docker/templates/installer/start.sh
+++ b/cyphernodeconf_docker/templates/installer/start.sh
@@ -43,36 +43,6 @@ start_apps() {
   done
 }
 
-test_apps() {
-  local SCRIPT_NAME="test.sh"
-  local APP_SCRIPT_PATH
-  local APP_START_SCRIPT_PATH
-  local APP_ID
-  local returncode=0
-
-  for i in $current_path/apps/*
-  do
-    APP_SCRIPT_PATH=$(echo $i)
-    if [ -d "$APP_SCRIPT_PATH" ]; then
-      APP_TEST_SCRIPT_PATH="$APP_SCRIPT_PATH/$SCRIPT_NAME"
-
-      if [ -f "$APP_TEST_SCRIPT_PATH" ] && [ ! -f "$APP_SCRIPT_PATH/ignoreThisApp" ]; then
-        APP_ID=$(basename "$APP_SCRIPT_PATH")
-        printf "\r\n\e[1;36mTesting $APP_ID... \e[1;0m"
-        . $APP_TEST_SCRIPT_PATH
-        local rc=$?
-
-        if [ ""$rc -eq "0" ]; then
-          printf "\e[1;36m$APP_ID rocks!\e[1;0m"
-        fi
-        returncode=$(($rc | ${returncode}))
-        echo ""
-      fi
-    fi
-  done
-  return $returncode
-}
-
 <% if (run_as_different_user) { %>
 OS=$(uname -s)
 if [ "$OS" = "Darwin" ]; then
@@ -96,36 +66,4 @@ docker-compose -f $current_path/docker-compose.yaml up -d --remove-orphans
 
 start_apps
 
-arch=$(uname -m)
-case "${arch}" in arm*)
-  printf "\r\n\033[1;31mSince we're on a slow RPi, let's give Docker 60 more seconds before performing our tests...\033[0m\r\n\r\n"
-  sleep 60
-;;
-esac
-
-# Will test if Cyphernode is fully up and running...
-docker run --rm -it -v $current_path/testfeatures.sh:/testfeatures.sh \
--v <%= gatekeeper_datapath %>:/gatekeeper \
--v $current_path:/dist \
---network cyphernodenet eclipse-mosquitto:1.6.2 /testfeatures.sh
-
-if [ -f $current_path/exitStatus.sh ]; then
-  . $current_path/exitStatus.sh
-  rm -f $current_path/exitStatus.sh
-fi
-
-test_apps
-
-EXIT_STATUS=$(($? | ${EXIT_STATUS}))
-
-printf "\r\n\e[1;32mTests finished.\e[0m\n"
-
-if [ "$EXIT_STATUS" -ne "0" ]; then
-  printf "\r\n\033[1;31mThere was an error during cyphernode installation.  Please see Docker's logs for more information.  Run ./stop.sh to stop cyphernode.\r\n\r\n\033[0m"
-  exit 1
-fi
-
-printf "\r\n\033[0;92mDepending on your current location and DNS settings, point your favorite browser to one of the following URLs to access Cyphernode's status page:\r\n"
-printf "\r\n"
-printf "\033[0;95m<% cns.forEach(cn => { %><%= ('https://' + cn + '/welcome\\r\\n') %><% }) %>\033[0m\r\n"
-printf "\033[0;92mUse 'admin' as the username with the configuration password you selected at the beginning of the configuration process.\r\n\r\n\033[0m"
+. ./testdeployment.sh
diff --git a/cyphernodeconf_docker/templates/installer/testdeployment.sh b/cyphernodeconf_docker/templates/installer/testdeployment.sh
new file mode 100644
index 0000000..1e42a54
--- /dev/null
+++ b/cyphernodeconf_docker/templates/installer/testdeployment.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+. ./.cyphernodeconf/installer/config.sh
+
+# be aware that randomly downloaded cyphernode apps will have access to
+# your configuration and filesystem.
+# !!!!!!!!! DO NOT INCLUDE APPS WITHOUT REVIEW !!!!!!!!!!
+# TODO: Test if we can mitigate this security issue by
+# running app dockers inside a docker container
+
+test_apps() {
+  local SCRIPT_NAME="test.sh"
+  local APP_SCRIPT_PATH
+  local APP_START_SCRIPT_PATH
+  local APP_ID
+  local returncode=0
+
+  for i in $current_path/apps/*
+  do
+    APP_SCRIPT_PATH=$(echo $i)
+    if [ -d "$APP_SCRIPT_PATH" ]; then
+      APP_TEST_SCRIPT_PATH="$APP_SCRIPT_PATH/$SCRIPT_NAME"
+
+      if [ -f "$APP_TEST_SCRIPT_PATH" ] && [ ! -f "$APP_SCRIPT_PATH/ignoreThisApp" ]; then
+        APP_ID=$(basename "$APP_SCRIPT_PATH")
+        printf "\r\n\e[1;36mTesting $APP_ID... \e[1;0m"
+        . $APP_TEST_SCRIPT_PATH
+        local rc=$?
+
+        if [ ""$rc -eq "0" ]; then
+          printf "\e[1;36m$APP_ID rocks!\e[1;0m"
+        fi
+        returncode=$(($rc | ${returncode}))
+        echo ""
+      fi
+    fi
+  done
+  return $returncode
+}
+
+<% if (run_as_different_user) { %>
+OS=$(uname -s)
+if [ "$OS" = "Darwin" ]; then
+  export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
+else
+  export USER=$(id -u <%= username %>):$(id -g <%= username %>)
+fi
+<% } else { %>
+export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
+<% } %>
+
+export ARCH=$(uname -m)
+current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+
+arch=$(uname -m)
+case "${arch}" in arm*)
+  printf "\r\n\033[1;31mSince we're on a slow RPi, let's give Docker 60 more seconds before performing our tests...\033[0m\r\n\r\n"
+  sleep 60
+;;
+esac
+
+# Will test if Cyphernode is fully up and running...
+docker run --rm -it -v $current_path/testfeatures.sh:/testfeatures.sh \
+-v <%= gatekeeper_datapath %>:/gatekeeper \
+-v $current_path:/dist \
+--network cyphernodenet eclipse-mosquitto:1.6.2 /testfeatures.sh
+
+if [ -f $current_path/exitStatus.sh ]; then
+  . $current_path/exitStatus.sh
+  rm -f $current_path/exitStatus.sh
+fi
+
+test_apps
+
+EXIT_STATUS=$(($? | ${EXIT_STATUS}))
+
+printf "\r\n\e[1;32mTests finished.\e[0m\n"
+
+if [ "$EXIT_STATUS" -ne "0" ]; then
+  printf "\r\n\033[1;31mThere was an error during cyphernode installation.  Please see Docker's logs for more information.  Run ./testdeployment.sh to rerun the tests.  Run ./stop.sh to stop cyphernode.\r\n\r\n\033[0m"
+  exit 1
+fi
+
+printf "\r\n\033[0;92mDepending on your current location and DNS settings, point your favorite browser to one of the following URLs to access Cyphernode's status page:\r\n"
+printf "\r\n"
+printf "\033[0;95m<% cns.forEach(cn => { %><%= ('https://' + cn + '/welcome\\r\\n') %><% }) %>\033[0m\r\n"
+printf "\033[0;92mUse 'admin' as the username with the configuration password you selected at the beginning of the configuration process.\r\n\r\n\033[0m"
diff --git a/dist/setup.sh b/dist/setup.sh
index 2ea59e0..7b13290 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -544,6 +544,7 @@ install_docker() {
   copy_file $cyphernodeconf_filepath/installer/testfeatures.sh $current_path/testfeatures.sh 0
   copy_file $cyphernodeconf_filepath/installer/start.sh $current_path/start.sh 0
   copy_file $cyphernodeconf_filepath/installer/stop.sh $current_path/stop.sh 0
+  copy_file $cyphernodeconf_filepath/installer/testdeployment.sh $current_path/testdeployment.sh 0
 
   if [[ ! -x $current_path/start.sh ]]; then
     step "     make start.sh executable"
@@ -562,6 +563,12 @@ install_docker() {
     try chmod +x $current_path/testfeatures.sh
     next
   fi
+
+  if [[ ! -x $current_path/testdeployment.sh ]]; then
+    step "     make testdeployment.sh executable"
+    try chmod +x $current_path/testdeployment.sh
+    next
+  fi
 }
 
 check_directory_owner() {