diff --git a/hphp/test/config.hdf b/hphp/test/config.hdf
index 1aab8b2d8..de0a86513 100644
--- a/hphp/test/config.hdf
+++ b/hphp/test/config.hdf
@@ -6,6 +6,7 @@ Eval {
   JitASize = 10485760 # 10 MB
   JitAStubsSize = 10485760 # 10 MB
   JitGlobalDataSize = 2097152 # 2 MB
+  JitEnableRenameFunction = true
 }
 
 MySQL {
diff --git a/hphp/test/ext/test_code_run.cpp b/hphp/test/ext/test_code_run.cpp
index 0b1eaf838..c0511f2ab 100644
--- a/hphp/test/ext/test_code_run.cpp
+++ b/hphp/test/ext/test_code_run.cpp
@@ -156,13 +156,10 @@ static bool verify_result(const char *input, const char *output, bool perfMode,
 
       string jitarg = string("-vEval.Jit=") +
         (RuntimeOption::EvalJit ? "true" : "false");
-      string jit_rename = string("-vEval.JitEnableRenameFunction=") +
-        (RuntimeOption::EvalJit ? "true" : "false");
       const char *argv[] = {"", filearg.c_str(),
                             "--config=test/slow/config.hdf",
                             repoarg.c_str(),
                             jitarg.c_str(),
-                            jit_rename.c_str(),
                             nullptr};
       Process::Exec(HHVM_PATH, argv, nullptr, actual, &err);
     }
diff --git a/hphp/test/run b/hphp/test/run
index 70b67fe83..4245f6c7a 100755
--- a/hphp/test/run
+++ b/hphp/test/run
@@ -86,7 +86,7 @@ function verify_hhbc() {
 }
 
 function read_file($file) {
-  return file_exists($file) ? 
+  return file_exists($file) ?
          preg_replace('/\s+/', ' ', (file_get_contents($file))) : "";
 }
 
@@ -227,8 +227,7 @@ function find_debug_config($test, $name) {
 
 function mode_cmd($options) {
   $repo_args = "-vRepo.Local.Mode=-- -vRepo.Central.Path=".verify_hhbc();
-  $jit_args = "$repo_args -vEval.Jit=true ".
-              "-vEval.JitEnableRenameFunction=true";
+  $jit_args = "$repo_args -vEval.Jit=true";
   $mode = idx($options, 'mode');
   switch ($mode) {
     case '':
@@ -392,7 +391,7 @@ function run_test($options, $test) {
   $hhvm = __DIR__."/../tools/timeout.sh -t 300 $hhvm";
   $output = "";
   if (isset($options['repo'])) {
-    if (strpos($test, '.hhas') !== false || 
+    if (strpos($test, '.hhas') !== false ||
         strpos($hhvm, '-m debug') != false || is_file($test.'.norepo')) {
       # We don't have a way to skip, I guess run non-repo?
     } else {
@@ -440,7 +439,7 @@ function run_test($options, $test) {
 
   if (file_exists("$test.expect")) {
     $diff_cmds = "--text -u";
-    exec("diff --text -u $test.expect $test.out > $test.diff 2>&1", 
+    exec("diff --text -u $test.expect $test.out > $test.diff 2>&1",
          $_, $status);
     // unix 0 == success
     return !$status;
@@ -507,7 +506,7 @@ function run_test($options, $test) {
     $wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re);
     $wanted_re = str_replace('%d', '\d+', $wanted_re);
     $wanted_re = str_replace('%x', '[0-9a-fA-F]+', $wanted_re);
-    $wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', 
+    $wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?',
                              $wanted_re);
     $wanted_re = str_replace('%c', '.', $wanted_re);
     // %f allows two points "-.0.0" but that is the best *simple* expression
diff --git a/hphp/test/slow/inlining/static_functions.php.opts b/hphp/test/slow/inlining/static_functions.php.opts
index 4338db0ae..cd5952509 100644
--- a/hphp/test/slow/inlining/static_functions.php.opts
+++ b/hphp/test/slow/inlining/static_functions.php.opts
@@ -1 +1 @@
--vEval.JitEnableRenameFunction=0 -vEval.EnableHipHopSyntax=1
+-vEval.EnableHipHopSyntax=1
diff --git a/hphp/test/slow/ir_inlining/inlining.opts b/hphp/test/slow/ir_inlining/inlining.opts
index 4338db0ae..cd5952509 100644
--- a/hphp/test/slow/ir_inlining/inlining.opts
+++ b/hphp/test/slow/ir_inlining/inlining.opts
@@ -1 +1 @@
--vEval.JitEnableRenameFunction=0 -vEval.EnableHipHopSyntax=1
+-vEval.EnableHipHopSyntax=1
diff --git a/hphp/test/slow/ir_inlining/multi_static.php.opts b/hphp/test/slow/ir_inlining/multi_static.php.opts
index 4338db0ae..cd5952509 100644
--- a/hphp/test/slow/ir_inlining/multi_static.php.opts
+++ b/hphp/test/slow/ir_inlining/multi_static.php.opts
@@ -1 +1 @@
--vEval.JitEnableRenameFunction=0 -vEval.EnableHipHopSyntax=1
+-vEval.EnableHipHopSyntax=1
diff --git a/hphp/test/slow/ir_inlining/weird_static.php.opts b/hphp/test/slow/ir_inlining/weird_static.php.opts
index 4338db0ae..cd5952509 100644
--- a/hphp/test/slow/ir_inlining/weird_static.php.opts
+++ b/hphp/test/slow/ir_inlining/weird_static.php.opts
@@ -1 +1 @@
--vEval.JitEnableRenameFunction=0 -vEval.EnableHipHopSyntax=1
+-vEval.EnableHipHopSyntax=1