diff --git a/contrib/TestHarness/Program.cs b/contrib/TestHarness/Program.cs
index 9bd3d6df18..b5161dc8bf 100644
--- a/contrib/TestHarness/Program.cs
+++ b/contrib/TestHarness/Program.cs
@@ -19,6 +19,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -487,6 +488,16 @@ namespace SummarizeTest
                         useValgrind ? "on" : "off");
                     }
 
+                    IDictionary data = Environment.GetEnvironmentVariables();
+                    foreach (DictionaryEntry i in data)
+                    {
+                        string k=(string)i.Key;
+                        string v=(string)i.Value;
+                        if (k.StartsWith("FDB_KNOB")) {
+                           process.StartInfo.EnvironmentVariables[k]=v;
+                        }
+                    }
+
                     process.Start();
 
                     // SOMEDAY: Do we want to actually do anything with standard output or error?
diff --git a/flow/include/flow/Platform.h b/flow/include/flow/Platform.h
index 1f72c5319a..9c62060b8e 100644
--- a/flow/include/flow/Platform.h
+++ b/flow/include/flow/Platform.h
@@ -282,7 +282,7 @@ void getLocalTime(const time_t* timep, struct tm* result);
 // get GMT time string from an epoch seconds double
 std::string epochsToGMTString(double epochs);
 
-#define ENVIRONMENT_KNOB_OPTION_PREFIX "JOSHUA_FDB_KNOB_"
+#define ENVIRONMENT_KNOB_OPTION_PREFIX "FDB_KNOB_"
 // returns list of environment variables with prefix ENVIRONMENT_KNOB_OPTION_PREFIX
 std::vector<std::string> getEnvironmentKnobOptions();