diff --git a/hphp/test/quick/zend_closure_007.php b/hphp/test/quick/zend_closure_007.php
deleted file mode 100644
index d357d2f93..000000000
--- a/hphp/test/quick/zend_closure_007.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class A {
-	private $x = 0;
-
-	function getClosureGetter () {
-		return function () {
-			return function () {
-				$this->x++;
-			};
-		};
-	}
-
-	function printX () {
-		echo $this->x."\n";
-	}
-}
-
-$a = new A;
-$a->printX();
-$getClosure = $a->getClosureGetter();
-$a->printX();
-$closure = $getClosure();
-$a->printX();
-$closure();
-$a->printX();
diff --git a/hphp/test/quick/zend_closure_007.php.expect b/hphp/test/quick/zend_closure_007.php.expect
deleted file mode 100644
index 530a8a796..000000000
--- a/hphp/test/quick/zend_closure_007.php.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-0
-0
-0
-1
diff --git a/hphp/test/quick/zend_closure_025.php b/hphp/test/quick/zend_closure_025.php
deleted file mode 100644
index 4538dab2f..000000000
--- a/hphp/test/quick/zend_closure_025.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$a = create_function('$x', 'return function($y) use ($x) { return $x * $y; };');
-
-var_dump($a(2)->__invoke(4));
-
-?>
\ No newline at end of file
diff --git a/hphp/test/quick/zend_closure_025.php.expect b/hphp/test/quick/zend_closure_025.php.expect
deleted file mode 100644
index d110ab2bc..000000000
--- a/hphp/test/quick/zend_closure_025.php.expect
+++ /dev/null
@@ -1 +0,0 @@
-int(8)
diff --git a/hphp/test/quick/zend_indirect_method_call_001.php b/hphp/test/quick/zend_indirect_method_call_001.php
deleted file mode 100644
index f4ff76893..000000000
--- a/hphp/test/quick/zend_indirect_method_call_001.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class foo {
-	public function __construct() {
-		throw new Exception('foobar');
-	}
-}
-
-try {
-	$X = (new foo)->Inexistent(3);
-} catch (Exception $e) {
-	var_dump($e->getMessage()); // foobar
-}
-
-?>
\ No newline at end of file
diff --git a/hphp/test/quick/zend_indirect_method_call_001.php.expect b/hphp/test/quick/zend_indirect_method_call_001.php.expect
deleted file mode 100644
index fc880e81c..000000000
--- a/hphp/test/quick/zend_indirect_method_call_001.php.expect
+++ /dev/null
@@ -1 +0,0 @@
-string(6) "foobar"
diff --git a/hphp/test/quick/zend_indirect_method_call_002.php b/hphp/test/quick/zend_indirect_method_call_002.php
deleted file mode 100644
index 54e6e6ed7..000000000
--- a/hphp/test/quick/zend_indirect_method_call_002.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class foo {
-	public $x = 'testing';
-
-	public function bar() {
-		return "foo";
-	}
-	public function baz() {
-		return new self;
-	}
-	static function xyz() {
-	}
-}
-
-var_dump((new foo())->bar());               // string(3) "foo"
-var_dump((new foo())->baz()->x);            // string(7) "testing"
-var_dump((new foo())->baz()->baz()->bar()); // string(3) "foo"
-var_dump((new foo())->xyz());               // NULL
-(new foo())->www();
-
-?>
\ No newline at end of file
diff --git a/hphp/test/quick/zend_indirect_method_call_002.php.expectf b/hphp/test/quick/zend_indirect_method_call_002.php.expectf
deleted file mode 100644
index d72ff3e63..000000000
--- a/hphp/test/quick/zend_indirect_method_call_002.php.expectf
+++ /dev/null
@@ -1,5 +0,0 @@
-string(3) "foo"
-string(7) "testing"
-string(3) "foo"
-NULL
-HipHop Fatal error: Call to undefined method foo::www from anonymous context in %s on line 20
diff --git a/hphp/test/quick/zend_indirect_method_call_003.php b/hphp/test/quick/zend_indirect_method_call_003.php
deleted file mode 100644
index 2322442be..000000000
--- a/hphp/test/quick/zend_indirect_method_call_003.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-class foo {
-	public $x = 1;
-
-	public function getX() {
-		return $this->x;
-	}
-	public function setX($val) {
-		$this->x = $val;
-		return $this;
-	}
-}
-
-$X = (new foo)->setX(10)->getX();
-var_dump($X); // int(10)
-
-?>
\ No newline at end of file
diff --git a/hphp/test/quick/zend_indirect_method_call_003.php.expect b/hphp/test/quick/zend_indirect_method_call_003.php.expect
deleted file mode 100644
index 5bb5f5709..000000000
--- a/hphp/test/quick/zend_indirect_method_call_003.php.expect
+++ /dev/null
@@ -1 +0,0 @@
-int(10)
diff --git a/hphp/test/quick/zend_indirect_method_call_004.php b/hphp/test/quick/zend_indirect_method_call_004.php
deleted file mode 100644
index a5d2fb77d..000000000
--- a/hphp/test/quick/zend_indirect_method_call_004.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-
-class bar {
-	public $z;
-
-	public function __construct() {
-		$this->z = new stdclass;
-	}
-	public function getZ() {
-		return $this->z;
-	}
-}
-
-var_dump(clone (new bar)->z);
-var_dump(clone (new bar)->getZ());
-
-?>
diff --git a/hphp/test/quick/zend_indirect_method_call_004.php.expect b/hphp/test/quick/zend_indirect_method_call_004.php.expect
deleted file mode 100644
index 32d2c30df..000000000
--- a/hphp/test/quick/zend_indirect_method_call_004.php.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-object(stdClass)#3 (0) {
-}
-object(stdClass)#5 (0) {
-}
diff --git a/hphp/test/quick/zend_indirect_property_access.php b/hphp/test/quick/zend_indirect_property_access.php
deleted file mode 100644
index 3041afde8..000000000
--- a/hphp/test/quick/zend_indirect_property_access.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class foo {
-	public $x = 1;
-}
-
-class bar {
-	public $y = 'foo';
-}
-
-$x = 'bar';
-
-$bar = new bar;
-
-var_dump((new bar)->y);     // foo
-var_dump((new $x)->y);      // foo
-var_dump((new $bar->y)->x); // 1
-
-?>
\ No newline at end of file
diff --git a/hphp/test/quick/zend_indirect_property_access.php.expect b/hphp/test/quick/zend_indirect_property_access.php.expect
deleted file mode 100644
index f76975817..000000000
--- a/hphp/test/quick/zend_indirect_property_access.php.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-string(3) "foo"
-string(3) "foo"
-int(1)