diff --git a/test/message/testcfg.py b/test/message/testcfg.py
index bc73510c09..7c53041016 100644
--- a/test/message/testcfg.py
+++ b/test/message/testcfg.py
@@ -59,6 +59,10 @@ class MessageTestSuite(testsuite.TestSuite):
           tests.append(test)
     return tests
 
+  def CreateVariantGenerator(self, variants):
+    return super(MessageTestSuite, self).CreateVariantGenerator(
+        variants + ["preparser"])
+
   def GetFlagsForTestCase(self, testcase, context):
     source = self.GetSourceForTest(testcase)
     result = []
diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py
index dd654c3035..6d52d58d5a 100644
--- a/tools/testrunner/local/testsuite.py
+++ b/tools/testrunner/local/testsuite.py
@@ -44,6 +44,7 @@ ALL_VARIANT_FLAGS = {
   "ignition": [["--ignition", "--ignition-filter=*",
                 "--ignition-fake-try-catch",
                 "--ignition-fallback-on-eval-and-catch"]],
+  "preparser": [["--min-preparse-length=0"]],
 }
 
 # FAST_VARIANTS implies no --always-opt.
@@ -55,10 +56,11 @@ FAST_VARIANT_FLAGS = {
   "ignition": [["--ignition", "--ignition-filter=*",
                 "--ignition-fake-try-catch",
                 "--ignition-fallback-on-eval-and-catch"]],
+  "preparser": [["--min-preparse-length=0"]],
 }
 
 ALL_VARIANTS = set(["default", "stress", "turbofan", "turbofan_opt",
-                    "nocrankshaft", "ignition"])
+                    "nocrankshaft", "ignition", "preparser"])
 FAST_VARIANTS = set(["default", "turbofan"])
 STANDARD_VARIANT = set(["default"])