Index: test/threadtest3.c
==================================================================
--- test/threadtest3.c
+++ test/threadtest3.c
@@ -1445,31 +1445,35 @@
     { lookaside1,          "lookaside1", 10000 },
     { vacuum1,             "vacuum1", 10000 },
     { stress1,             "stress1", 10000 },
     { stress2,             "stress2", 60000 },
   };
-
-  int i;
+  static char *substArgv[] = { 0, "*", 0 };
+  int i, iArg;
   int nTestfound = 0;
 
   sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
-  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
-
-  for(i=0; i<sizeof(aTest)/sizeof(aTest[0]); i++){
-    char const *z = aTest[i].zTest;
-    if( argc>1 ){
-      int iArg;
-      for(iArg=1; iArg<argc; iArg++){
-        if( 0==sqlite3_strglob(argv[iArg], z) ) break;
-      }
-      if( iArg==argc ) continue;
-    }
-
-    printf("Running %s for %d seconds...\n", z, aTest[i].nMs/1000);
-    fflush(stdout);
-    aTest[i].xTest(aTest[i].nMs);
-    nTestfound++;
+  if( argc<2 ){
+    argc = 2;
+    argv = substArgv;
+  }
+  for(iArg=1; iArg<argc; iArg++){
+    for(i=0; i<sizeof(aTest)/sizeof(aTest[0]); i++){
+      if( sqlite3_strglob(argv[iArg],aTest[i].zTest)==0 ) break;
+    }
+    if( i>=sizeof(aTest)/sizeof(aTest[0]) ) goto usage;   
+  }
+  for(iArg=1; iArg<argc; iArg++){
+    for(i=0; i<sizeof(aTest)/sizeof(aTest[0]); i++){
+      char const *z = aTest[i].zTest;
+      if( sqlite3_strglob(argv[iArg],z)==0 ){
+        printf("Running %s for %d seconds...\n", z, aTest[i].nMs/1000);
+        fflush(stdout);
+        aTest[i].xTest(aTest[i].nMs);
+        nTestfound++;
+      }
+    }
   }
   if( nTestfound==0 ) goto usage;
 
   printf("%d errors out of %d tests\n", nGlobalErr, nTestfound);
   return (nGlobalErr>0 ? 255 : 0);