diff --git a/hphp/test/quick/autoload5.php b/hphp/test/quick/autoload4.inc
similarity index 100%
rename from hphp/test/quick/autoload5.php
rename to hphp/test/quick/autoload4.inc
diff --git a/hphp/test/quick/autoload4.php b/hphp/test/quick/autoload4.php
index b99bc6105..de2b25e99 100644
--- a/hphp/test/quick/autoload4.php
+++ b/hphp/test/quick/autoload4.php
@@ -6,6 +6,6 @@ function __autoload($cls) {
   echo "__autoload $cls\n";
 }
 
-require "autoload5.php";
+require "autoload4.inc";
 
 print "Test end\n";
diff --git a/hphp/test/quick/backup_cycle_collector.php b/hphp/test/quick/backup_cycle_collector.php
deleted file mode 100644
index 5abd6df0b..000000000
--- a/hphp/test/quick/backup_cycle_collector.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-class Blah {
-  public $x = "uncollected string";
-}
-
-class Cycler {
-  public function __destruct() { echo "Shouldn't run\n"; }
-
-  public $x = null;
-  public $y;
-}
-
-function test_cycles($what) {
-  echo "-------------------" . $what . "---------------------------\n";
-  $file = tempnam("/tmp", "cycles_unit_test");
-  fb_gc_detect_cycles($file);
-  echo @file_get_contents($file);
-  @unlink($file);
-  echo fb_gc_collect_cycles();
-}
-
-function decl_prop_cycle() {
-  global $x;
-  $x = new Blah();
-
-  // y <---> x
-  $y = new Cycler();
-  $y->y = "this is a string";
-  $y->x = new Cycler();
-  $y->x->x = $y;
-
-  /*
-   * y2 ---> y3 -----> array(Cycler())
-   * ^        |
-   * |        |
-   * +-- y4 <-+
-   */
-  $y2 = new Cycler();
-  $y3 = new Cycler();
-  $y4 = new Cycler();
-  $y2->x = $y3;
-  $y3->x = $y4;
-  $y4->x = $y2;
-  $y3->y = array(new Cycler());
-}
-
-decl_prop_cycle();
-test_cycles("decl");
-var_dump($x->x);
-
-function dyn_prop_cycle() {
-  $y = new Cycler();
-  $y->d_y = "this is a string";
-  $y->d_x = new Cycler();
-  $y->d_x->d_x = $y;
-
-  // Same graph as decl_prop_cycle, but will have the dynprop array in
-  // between everything.
-  $y2 = new Cycler();
-  $y3 = new Cycler();
-  $y4 = new Cycler();
-  $y2->d_x = $y3;
-  $y3->d_x = $y4;
-  $y4->d_x = $y2;
-  $y3->d_y = array(new Cycler());
-}
-
-dyn_prop_cycle();
-test_cycles("dyn");
-var_dump($x->x);
-
-function array_cycle() {
-  /*
-   * array() ------------------> $x
-   *   ^                          |
-   *   |                          |
-   *   |                          v
-   * array() ---> array() ---> RefData
-   *   ^                          |
-   *   |                          |
-   *   +--------------------------+
-   */
-  $y = array();
-  $x = new Cycler();
-  $x->x =& $y;
-  $y["one"]["bar"] = $x;
-  $y["two"]["bar"] =& $y;
-  $y["three"] = "string data";
-}
-
-array_cycle();
-test_cycles("array");
-var_dump($x->x);
diff --git a/hphp/test/quick/condinfinite.php b/hphp/test/quick/condinfinite.php
deleted file mode 100644
index 094eca817..000000000
--- a/hphp/test/quick/condinfinite.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-function main() {
-  if(true) {
-    for(; ;) {
-      for(; ;) { }
-    }
-  } else {
-    for(; ;) {
-      for(; ;) { }
-    }
-  }
-
-}
-main();
-
diff --git a/hphp/test/quick/condinfinite2.php b/hphp/test/quick/condinfinite2.php
deleted file mode 100644
index 48babd6db..000000000
--- a/hphp/test/quick/condinfinite2.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-function main() {
-  for($i = 0; $i < 10;) {
-    if(true) {
-      $i++;
-    }
-  }
-}
diff --git a/hphp/test/quick/define_b.php b/hphp/test/quick/define.inc
similarity index 100%
rename from hphp/test/quick/define_b.php
rename to hphp/test/quick/define.inc
diff --git a/hphp/test/quick/define.php b/hphp/test/quick/define.php
index 23d21a6ce..0882c1179 100644
--- a/hphp/test/quick/define.php
+++ b/hphp/test/quick/define.php
@@ -1,6 +1,6 @@
 <?php
 function foo() {
-  require 'define_b.php';
+  require 'define.inc';
 }
 
 function main() {
diff --git a/hphp/test/quick/_fbcufa_init.php b/hphp/test/quick/fbcufa.inc
similarity index 100%
rename from hphp/test/quick/_fbcufa_init.php
rename to hphp/test/quick/fbcufa.inc
diff --git a/hphp/test/quick/fbcufa.php b/hphp/test/quick/fbcufa.php
index e81ab5a3b..13b9ee1ac 100644
--- a/hphp/test/quick/fbcufa.php
+++ b/hphp/test/quick/fbcufa.php
@@ -1,5 +1,5 @@
 <?php
-$doc = dirname(__FILE__) . '/_fbcufa_init.php';
+$doc = dirname(__FILE__) . '/fbcufa.inc';
 require_once $doc;
 function main() {
   global $doc;
diff --git a/hphp/test/quick/include_b.php b/hphp/test/quick/include.1.inc
similarity index 100%
rename from hphp/test/quick/include_b.php
rename to hphp/test/quick/include.1.inc
diff --git a/hphp/test/quick/include_c.php b/hphp/test/quick/include.2.inc
similarity index 100%
rename from hphp/test/quick/include_c.php
rename to hphp/test/quick/include.2.inc
diff --git a/hphp/test/quick/include_d.php b/hphp/test/quick/include.3.inc
similarity index 100%
rename from hphp/test/quick/include_d.php
rename to hphp/test/quick/include.3.inc
diff --git a/hphp/test/quick/include.php b/hphp/test/quick/include.php
index f6790154d..910d3081a 100644
--- a/hphp/test/quick/include.php
+++ b/hphp/test/quick/include.php
@@ -3,19 +3,19 @@
 $a = 1;#"a\n";
 print $a."\n";
 
-require 'include_b.php';
+require 'include.1.inc';
 
 print $a."\n";
 print $b."\n";
 
 function foo() {
-  require 'include_c.php';
+  require 'include.2.inc';
 }
 foo();
 
-$path = dirname(__FILE__) . '/include_d.php';
+$path = dirname(__FILE__) . '/include.3.inc';
 require $path;
 
-$path = __DIR__ . '/include_d.php';
+$path = __DIR__ . '/include.3.inc';
 require $path;
 
diff --git a/hphp/test/quick/include2_a.php b/hphp/test/quick/include2.1.inc
similarity index 100%
rename from hphp/test/quick/include2_a.php
rename to hphp/test/quick/include2.1.inc
diff --git a/hphp/test/quick/include2_b.php b/hphp/test/quick/include2.2.inc
similarity index 100%
rename from hphp/test/quick/include2_b.php
rename to hphp/test/quick/include2.2.inc
diff --git a/hphp/test/quick/include2.php b/hphp/test/quick/include2.php
index 5bb2bc381..e740040c3 100644
--- a/hphp/test/quick/include2.php
+++ b/hphp/test/quick/include2.php
@@ -5,14 +5,14 @@ $x = 12;
 $y = 34;
 @f();
 $z = 56;
-$t = include 'include2_a.php';
+$t = include 'include2.1.inc';
 var_dump($x);
 var_dump($y);
 var_dump($z);
 var_dump($t);
-$t = include_once 'include2_a.php';
+$t = include_once 'include2.1.inc';
 var_dump($t);
-$t = @include_once 'include_doesnt_exist.php';
+$t = @include_once 'include2_doesnt_exist.inc';
 var_dump($t);
-$t = include_once 'include2_b.php';
+$t = include_once 'include2.2.inc';
 var_dump($t);
diff --git a/hphp/test/quick/include3_a.php b/hphp/test/quick/include3.inc
similarity index 100%
rename from hphp/test/quick/include3_a.php
rename to hphp/test/quick/include3.inc
diff --git a/hphp/test/quick/include3.php b/hphp/test/quick/include3.php
index 0eb2bae05..94fe5088c 100644
--- a/hphp/test/quick/include3.php
+++ b/hphp/test/quick/include3.php
@@ -5,7 +5,7 @@ class A {
   private $d;
   public function f() {
     eval('$this->a = 20; $this->c = 200;');
-    include 'include3_a.php';
+    include 'include3.inc';
     echo $this->a."\n";
     echo $this->b."\n";
     echo $this->c."\n";
diff --git a/hphp/test/quick/include_backtrace2.php b/hphp/test/quick/include_backtrace.inc
similarity index 100%
rename from hphp/test/quick/include_backtrace2.php
rename to hphp/test/quick/include_backtrace.inc
diff --git a/hphp/test/quick/include_backtrace.php b/hphp/test/quick/include_backtrace.php
index 4267ea776..7d5fe5dc0 100644
--- a/hphp/test/quick/include_backtrace.php
+++ b/hphp/test/quick/include_backtrace.php
@@ -1 +1 @@
-<?php include "include_backtrace2.php";
+<?php include "include_backtrace.inc";
diff --git a/hphp/test/quick/infinite.php b/hphp/test/quick/infinite.php
deleted file mode 100644
index 0af2f4540..000000000
--- a/hphp/test/quick/infinite.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-for(; ;) {
-  for(; ;) { }
-}
-
-?>
diff --git a/hphp/test/quick/redeclared_class1.php b/hphp/test/quick/redeclared_class.1.inc
similarity index 100%
rename from hphp/test/quick/redeclared_class1.php
rename to hphp/test/quick/redeclared_class.1.inc
diff --git a/hphp/test/quick/redeclared_class2.php b/hphp/test/quick/redeclared_class.2.inc
similarity index 100%
rename from hphp/test/quick/redeclared_class2.php
rename to hphp/test/quick/redeclared_class.2.inc
diff --git a/hphp/test/quick/redeclared_class_a.php b/hphp/test/quick/redeclared_class_a.php
index 854296867..d856a791c 100644
--- a/hphp/test/quick/redeclared_class_a.php
+++ b/hphp/test/quick/redeclared_class_a.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "redeclared_class1.php";
-require_once "redeclared_class2.php";
+require_once "redeclared_class.1.inc";
+require_once "redeclared_class.2.inc";
 
 var_dump(X::V);
diff --git a/hphp/test/quick/redeclared_class_b.php b/hphp/test/quick/redeclared_class_b.php
index 523f0f2c3..721cf3245 100644
--- a/hphp/test/quick/redeclared_class_b.php
+++ b/hphp/test/quick/redeclared_class_b.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "redeclared_class2.php";
-require_once "redeclared_class1.php";
+require_once "redeclared_class.2.inc";
+require_once "redeclared_class.1.inc";
 
 var_dump(X::V);
diff --git a/hphp/test/quick/ReqOnce_b.php b/hphp/test/quick/reqonce2.inc
similarity index 100%
rename from hphp/test/quick/ReqOnce_b.php
rename to hphp/test/quick/reqonce2.inc
diff --git a/hphp/test/quick/reqonce2.php b/hphp/test/quick/reqonce2.php
index ba3b0ee79..48fc3d275 100644
--- a/hphp/test/quick/reqonce2.php
+++ b/hphp/test/quick/reqonce2.php
@@ -2,8 +2,8 @@
 
 print "Test begin\n";
 
-require_once 'ReqOnce_b.php';
+require_once 'reqonce2.inc';
 print "Between require_once invocations\n";
-require_once 'ReqOnce_b.php';
+require_once 'reqonce2.inc';
 
 print "Test end\n";