diff --git a/tests/hwsim/README b/tests/hwsim/README
index 56613acd6..dd4dcae17 100644
--- a/tests/hwsim/README
+++ b/tests/hwsim/README
@@ -151,10 +151,10 @@ For manual testing, ./start.sh can be used to initialize interfaces and
 programs and run-tests.py to execute one or more test
 cases. run-tests.py output verbosity can be controlled with -d (more
 verbose debug output) and -q (less verbose output) on the command
-line. "-f <test_filename(without.py)>" can be used to specify that all
-test cases from a single file are to be run. Test name as the last
-command line argument can be specified that a single test case is to be
-run (e.g., "./run-tests.py ap_pmf_required").
+line. "-f <module name>" (pointing to file test_<module name>.py) can be
+used to specify that all test cases from a single file are to be
+run. Test name as the last command line argument can be specified that a
+single test case is to be run (e.g., "./run-tests.py ap_pmf_required").
 
 
 Adding/modifying test cases
diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh
index 47daa9ab4..126380e62 100755
--- a/tests/hwsim/run-all.sh
+++ b/tests/hwsim/run-all.sh
@@ -24,12 +24,12 @@ fi
 if [ "x$1" = "xconcurrent-valgrind" ]; then
 	VALGRIND=valgrind
 	CONCURRENT=concurrent
-	CONCURRENT_TESTS="-f test_p2p_autogo test_p2p_discovery test_p2p_grpform"
+	CONCURRENT_TESTS="-f p2p_autogo p2p_discovery p2p_grpform"
 	SUFFIX=-concurrent-valgrind
 	shift
 elif [ "x$1" = "xconcurrent" ]; then
 	CONCURRENT=concurrent
-	CONCURRENT_TESTS="-f test_p2p_autogo test_p2p_discovery test_p2p_grpform"
+	CONCURRENT_TESTS="-f p2p_autogo p2p_discovery p2p_grpform"
 	unset VALGRIND
 	SUFFIX=-concurrent
 	shift
diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py
index 0fd7d2319..9908dc569 100755
--- a/tests/hwsim/run-tests.py
+++ b/tests/hwsim/run-tests.py
@@ -81,7 +81,7 @@ def main():
         if m:
             logger.debug("Import test cases from " + t)
             mod = __import__(m.group(1))
-            test_modules.append(mod.__name__)
+            test_modules.append(mod.__name__.replace('test_', '', 1))
             for s in dir(mod):
                 if s.startswith("test_"):
                     func = mod.__dict__.get(s)
@@ -214,7 +214,7 @@ def main():
             if not name in args.tests:
                 continue
         if args.testmodules:
-            if not t.__module__ in args.testmodules:
+            if not t.__module__.replace('test_', '', 1) in args.testmodules:
                 continue
         with DataCollector(args.logdir, name, args.tracing, args.dmesg):
             logger.info("START " + name)