diff --git a/test/Makefile.am b/test/Makefile.am
index b7542fd0..dc090d99 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,10 +1,10 @@
-AM_TESTS_ENVIRONMENT = make --silent --no-print-directory -C test_root/;
+AM_TESTS_ENVIRONMENT = make --silent --no-print-directory -C test-root/;
 
-TESTS		     = checkself.sh
-TESTS		     += test_add_remove_dynamic_service/test.sh
-TESTS		     += test_add_remove_dynamic_service_sub_config/test.sh
-TESTS                += test_start_stop_service/test.sh
-TESTS                += test_start_stop_service_sub_config/test.sh
+TESTS                = checkself.sh
+TESTS                += add-remove-dynamic-service/test.sh
+TESTS                += add-remove-dynamic-service-sub-config/test.sh
+TESTS                += start-stop-service/test.sh
+TESTS                += start-stop-service-sub-config/test.sh
 
 clean-local:
-	make -C test_root/ clean
+	make -C test-root/ clean
diff --git a/test/test_add_remove_dynamic_service_sub_config/test.sh b/test/add-remove-dynamic-service-sub-config/test.sh
similarity index 88%
rename from test/test_add_remove_dynamic_service_sub_config/test.sh
rename to test/add-remove-dynamic-service-sub-config/test.sh
index a6c1f554..b541ac9f 100755
--- a/test/test_add_remove_dynamic_service_sub_config/test.sh
+++ b/test/add-remove-dynamic-service-sub-config/test.sh
@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")/..
-TESTENV_ROOT="$TEST_DIR"/test_root
+TESTENV_ROOT="$TEST_DIR"/test-root
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
@@ -18,7 +18,7 @@ test_teardown() {
 
 say "Test start $(date)"
 
-cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test-root/test_assets/
 
 say "Add a dynamic service in $FINIT_CONF_DIR/service.conf"
 texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF_DIR/service.conf"
diff --git a/test/test_add_remove_dynamic_service/test.sh b/test/add-remove-dynamic-service/test.sh
similarity index 87%
rename from test/test_add_remove_dynamic_service/test.sh
rename to test/add-remove-dynamic-service/test.sh
index f109196d..3abf3614 100755
--- a/test/test_add_remove_dynamic_service/test.sh
+++ b/test/add-remove-dynamic-service/test.sh
@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")/..
-TESTENV_ROOT="$TEST_DIR"/test_root
+TESTENV_ROOT="$TEST_DIR"/test-root
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
@@ -18,7 +18,7 @@ test_teardown() {
 
 say "Test start $(date)"
 
-cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test-root/test_assets/
 
 say "Add a dynamic service in $FINIT_CONF"
 texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"
diff --git a/test/test_start_stop_service_sub_config/test.sh b/test/start-stop-service-sub-config/test.sh
similarity index 88%
rename from test/test_start_stop_service_sub_config/test.sh
rename to test/start-stop-service-sub-config/test.sh
index cfc684fb..f2819679 100755
--- a/test/test_start_stop_service_sub_config/test.sh
+++ b/test/start-stop-service-sub-config/test.sh
@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")/..
-TESTENV_ROOT="$TEST_DIR"/test_root
+TESTENV_ROOT="$TEST_DIR"/test-root
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
@@ -18,7 +18,7 @@ test_teardown() {
 
 say "Test start $(date)"
 
-cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test-root/test_assets/
 
 say "Add service stanza in $FINIT_CONF_DIR/service.conf"
 texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF_DIR/service.conf"
diff --git a/test/test_start_stop_service/test.sh b/test/start-stop-service/test.sh
similarity index 88%
rename from test/test_start_stop_service/test.sh
rename to test/start-stop-service/test.sh
index e55553d8..0e64ce46 100755
--- a/test/test_start_stop_service/test.sh
+++ b/test/start-stop-service/test.sh
@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")/..
-TESTENV_ROOT="$TEST_DIR"/test_root
+TESTENV_ROOT="$TEST_DIR"/test-root
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
@@ -18,7 +18,7 @@ test_teardown() {
 
 say "Test start $(date)"
 
-cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test-root/test_assets/
 
 say "Add service stanza in $FINIT_CONF"
 texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"
diff --git a/test/test_root/.gitignore b/test/test-root/.gitignore
similarity index 100%
rename from test/test_root/.gitignore
rename to test/test-root/.gitignore
diff --git a/test/test_root/Makefile b/test/test-root/Makefile
similarity index 100%
rename from test/test_root/Makefile
rename to test/test-root/Makefile
diff --git a/test/test_root/bin/chrootsetup.sh b/test/test-root/bin/chrootsetup.sh
similarity index 100%
rename from test/test_root/bin/chrootsetup.sh
rename to test/test-root/bin/chrootsetup.sh
diff --git a/test/test_root/busybox-x86_64.md5 b/test/test-root/busybox-x86_64.md5
similarity index 100%
rename from test/test_root/busybox-x86_64.md5
rename to test/test-root/busybox-x86_64.md5
diff --git a/test/testenv_exec.sh b/test/testenv_exec.sh
index 5243c142..b6306838 100755
--- a/test/testenv_exec.sh
+++ b/test/testenv_exec.sh
@@ -11,7 +11,7 @@ target="$1"
 shift
 
 TEST_DIR=$(dirname "$0")
-TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
+TESTS_ROOT="$(pwd)/${TEST_DIR}/test-root"
 
 nsenter=$(command -v nsenter)
 chroot=$(command -v chroot)
diff --git a/test/testenv_start.sh b/test/testenv_start.sh
index 7dcf2869..7f0d97f0 100755
--- a/test/testenv_start.sh
+++ b/test/testenv_start.sh
@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")
-TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
+TESTS_ROOT="$(pwd)/${TEST_DIR}/test-root"
 
 unshare=$(command -v unshare)
 chroot=$(command -v chroot)