diff --git a/tests/runner.sh b/tests/runner.sh
index a6fe566c..2f983697 100755
--- a/tests/runner.sh
+++ b/tests/runner.sh
@@ -22,6 +22,7 @@ default_suites=(
 )
 
 extra_suites=(
+	ehdd
 	remote-nextcloud
 	"upgrade-<name>"
 )
@@ -41,6 +42,7 @@ usage() {
 	echo ""
 	echo "Extra test suites:"
 	echo "------------------"
+	echo "  ehdd               : test encryption-at-rest"
 	echo "  remote-nextcloud   : test the setup mod for remote Nextcloud"
 	echo "  upgrade-<name>     : verify an upgrade using named populate data"
 	echo ""
diff --git a/tests/suites/ehdd.sh b/tests/suites/ehdd.sh
new file mode 100644
index 00000000..734b5f2e
--- /dev/null
+++ b/tests/suites/ehdd.sh
@@ -0,0 +1,44 @@
+
+
+test_ehdd_restart() {
+    test_start "ehdd-restart"
+
+    # a keyfile must be in use, to avoid user interaction
+    if [ -z "$EHDD_KEYFILE" ]; then
+        test_failure "EHDD_KEYFILE must be set"
+        test_end
+        return
+    fi
+
+    # the keyfile must exist
+    if [ ! -e "$EHDD_KEYFILE" ]; then
+        test_failure "Keyfile path '$EHDD_KEYFILE' does not exist"
+        test_end
+        return
+    fi
+    
+    # shutdown and unmount
+    local rc=0
+    pushd .. >/dev/null
+
+    record "[Run ehdd/shutdown.sh]"
+    ehdd/shutdown.sh >>$TEST_OF 2>&1
+    [ $? -ne 0 ] && test_failure "Could not unmount encryption-at-rest drive"
+
+    # startup
+    record "[Run ehdd/startup.sh]"
+    ehdd/startup.sh >>$TEST_OF 2>&1
+    [ $? -ne 0 ] && test_failure "Could not start encryption-at-rest"
+
+    popd >/dev/null
+    
+    test_end
+}
+
+
+
+suite_start "ehdd"
+
+test_ehdd_restart
+
+suite_end
diff --git a/tests/vagrant/Vagrantfile b/tests/vagrant/Vagrantfile
index 8e019e93..9dc982a7 100644
--- a/tests/vagrant/Vagrantfile
+++ b/tests/vagrant/Vagrantfile
@@ -17,7 +17,7 @@ echo -n "boo" >$EHDD_KEYFILE
 cd /mailinabox
 tests/system-setup/remote-nextcloud-docker.sh; rc=$?
 if [ $rc -eq 0 ]; then
-   tests/runner.sh default remote-nextcloud; rc=$?
+   tests/runner.sh ehdd default remote-nextcloud; rc=$?
 fi
 echo "EXITCODE: $rc"
 SH