diff --git a/mk/common-test.sh b/mk/common-test.sh
index fd79f089c9c0..00ccd1584239 100644
--- a/mk/common-test.sh
+++ b/mk/common-test.sh
@@ -3,7 +3,7 @@
 test_name=$(echo -n "$test" | sed \
     -e "s|^unit-test-data/||" \
     -e "s|^tests/functional/||" \
-    -e "s|\..*$||" \
+    -e "s|\.sh$||" \
     )
 
 TESTS_ENVIRONMENT=(
diff --git a/mk/run-test.sh b/mk/run-test.sh
index 27db5b744d66..da9c5a473b40 100755
--- a/mk/run-test.sh
+++ b/mk/run-test.sh
@@ -13,7 +13,7 @@ init=${2-}
 dir="$(dirname "${BASH_SOURCE[0]}")"
 source "$dir/common-test.sh"
 
-post_run_msg="ran test $test_name..."
+post_run_msg="ran test $test..."
 if [ -t 1 ]; then
     red=""
     green=""