diff --git a/Makefile b/Makefile
index e33be3f2..d727bccc 100644
--- a/Makefile
+++ b/Makefile
@@ -247,5 +247,8 @@ pub:
 test:
 	$(helper) $@
 
+test-remote:
+	$(helper) $@
+
 pep8:
 	$(helper) $@
diff --git a/bin/build-helper b/bin/build-helper
index 46b139d1..ef15b6c2 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -359,6 +359,11 @@ eof
         fi
     ;;
 
+    test-remote)
+        export PYTHONPATH="$(pwd -P)"
+        python3 -m cdist.test.exec.remote
+    ;;
+
     pep8)
         pep8 "${basedir}" "${basedir}/scripts/cdist" | less
     ;;
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
index 183129db..e49b2f7a 100755
--- a/bin/build-helper.freebsd
+++ b/bin/build-helper.freebsd
@@ -421,6 +421,11 @@ eof
         fi
     ;;
 
+    test-remote)
+        export PYTHONPATH="$(pwd -P)"
+        python3 -m cdist.test.exec.remote
+    ;;
+
     pep8)
         pep8 "${basedir}" "${basedir}/scripts/cdist" | less
     ;;