diff --git a/oft b/oft
index e3135e5..596b953 100755
--- a/oft
+++ b/oft
@@ -247,7 +247,7 @@
     parser.add_option("--base-if-index", type="int",
                       help="Base interface index number (optional)")
     parser.add_option("--list-test-names", action='store_true',
-                      help="List only test names.", default=False)
+                      help="List test names matching the test spec and exit", default=False)
     parser.add_option("--list", action="store_true",
                       help="List all tests and exit")
     parser.add_option("-v", "--verbose", action="store_true",
@@ -432,7 +432,7 @@
 if test_specs == []:
     test_specs = ["standard"]
 
-test_modules = prune_tests(test_specs, load_test_modules(config))
+test_modules = load_test_modules(config)
 
 load_profile(config)
 
@@ -471,6 +471,8 @@
     print "Note that --profile may override which tests are run"
     sys.exit(0)
 
+test_modules = prune_tests(test_specs, test_modules)
+
 # Check if test list is requested; display and exit if so
 if config["list_test_names"]:
     for (modname, (mod, tests)) in test_modules.items():