1 files changed, 6 insertions, 4 deletions
diff --git a/selftest/selftest.py b/selftest/selftest.py
index cbc24f13ce..5c9bd7d13c 100755
--- a/selftest/selftest.py
+++ b/selftest/selftest.py
@@ -39,7 +39,10 @@ from selftest import (
     subunithelper,
     testlist,
     )
-from selftest.run import expand_environment_strings
+from selftest.run import (
+    expand_environment_strings,
+    expand_command_list,
+    )
 from selftest.target import (
     EnvironmentManager,
     NoneTarget,
@@ -577,12 +580,11 @@ $envvarstr
     env_manager.teardown_env(testenv_name)
 elif opts.list:
     for (name, envname, cmd, supports_loadfile, supports_idlist, subtests) in todo:
-        if not "$LISTOPT" in cmd:
+        cmd = expand_command_list(cmd)
+        if cmd is None:
             warnings.warn("Unable to list tests in %s" % name)
             continue
 
-        cmd = cmd.replace("$LISTOPT", "--list")
-
         exitcode = subprocess.call(cmd, shell=True)
 
         if exitcode != 0: