diff --git a/.travis.yml b/.travis.yml
index 358538c63..c16510f57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,12 @@ language: cpp
 compiler:
   - gcc
 
-before_script: 
+before_script:
   - time TRAVIS=1 ./configure_ubuntu_12.04.sh
-# for some tests  
+# for some tests
   - time sudo locale-gen de_DE && sudo locale-gen zh_CN.utf8 && sudo locale-gen fr_FR
   - time HPHP_HOME=`pwd` make -j 6
+  - cd hphp/test/zend/good/ext/curl/tests/responder && ../../../../../../../hhvm/hhvm -m server -p 8444 &
 # mysql configuration for unit-tests
   - mysql -e 'CREATE DATABASE IF NOT EXISTS hhvm;'
   - export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=hhvm"
@@ -40,7 +41,7 @@ env:
   - TEST_RUN_MODE="-m interp -r zend -I /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
   - TEST_RUN_MODE="-m interp -r zend -E /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
 
-script: time hphp/hhvm/hhvm hphp/test/run $TEST_RUN_MODE
+script: time PHP_CURL_HTTP_REMOTE_SERVER="http://localhost:8444" hphp/hhvm/hhvm hphp/test/run $TEST_RUN_MODE
 
 notifications:
   email: false
diff --git a/hphp/runtime/ext/ext_simplexml.h b/hphp/runtime/ext/ext_simplexml.h
index 40d4e4097..12919b8bd 100644
--- a/hphp/runtime/ext/ext_simplexml.h
+++ b/hphp/runtime/ext/ext_simplexml.h
@@ -27,7 +27,11 @@ namespace HPHP {
 
 Variant f_simplexml_import_dom(CObjRef node,
                                const String& class_name = "SimpleXMLElement");
-Variant f_simplexml_load_string(const String& data, const String& class_name = "SimpleXMLElement", int64_t options = 0, const String& ns = "", bool is_prefix = false);
+Variant f_simplexml_load_string(const String& data,
+                                const String& class_name = "SimpleXMLElement",
+                                int64_t options = 0,
+                                const String& ns = "",
+                                bool is_prefix = false);
 Variant f_simplexml_load_file(const String& filename, const String& class_name = "SimpleXMLElement", int64_t options = 0, const String& ns = "", bool is_prefix = false);
 Variant f_libxml_get_errors();
 Variant f_libxml_get_last_error();
diff --git a/hphp/test/zend/bad/ext/curl/tests/bug55767.php b/hphp/test/zend/good/ext/curl/tests/bug55767.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/bug55767.php
rename to hphp/test/zend/good/ext/curl/tests/bug55767.php
index 4eedccee5..1dc76d9b2 100644
--- a/hphp/test/zend/bad/ext/curl/tests/bug55767.php
+++ b/hphp/test/zend/good/ext/curl/tests/bug55767.php
@@ -18,7 +18,7 @@
   curl_setopt($ch, CURLOPT_POST, 1);
   curl_setopt($ch, CURLOPT_POSTFIELDS, array('Hello'=>'World','Foo'=>'Bar',100=>'John Doe'));
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/bug55767.php.expectf b/hphp/test/zend/good/ext/curl/tests/bug55767.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/bug55767.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/bug55767.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/bug55767.php.skipif b/hphp/test/zend/good/ext/curl/tests/bug55767.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/bug55767.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_CURLOPT_READDATA.php b/hphp/test/zend/good/ext/curl/tests/curl_CURLOPT_READDATA.php
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_CURLOPT_READDATA.php
rename to hphp/test/zend/good/ext/curl/tests/curl_CURLOPT_READDATA.php
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_CURLOPT_READDATA.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_CURLOPT_READDATA.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_CURLOPT_READDATA.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_CURLOPT_READDATA.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_CURLOPT_READDATA.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_CURLOPT_READDATA.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_CURLOPT_READDATA.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_001.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_001.php
similarity index 90%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_001.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_001.php
index 38764375e..ecde0a50e 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_001.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_001.php
@@ -1,10 +1,10 @@
 <?php
 /* Prototype  : bool curl_exec(resource ch)
- * Description: Perform a cURL session 
+ * Description: Perform a cURL session
  * Source code: ext/curl/interface.c
- * Alias to functions: 
+ * Alias to functions:
  */
-	
+
   $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
 
   // start testing
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_001.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_001.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_001.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_001.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_001.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_001.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_001.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_002.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_002.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_002.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_002.php
index 532396ba1..a70da6b7b 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_002.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_002.php
@@ -16,7 +16,7 @@
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_002.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_002.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_002.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_002.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_002.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_002.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_002.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_003.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_003.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_003.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_003.php
index 67edf0b95..a7fb36b0a 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_003.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_003.php
@@ -18,7 +18,7 @@
   curl_setopt($ch, CURLOPT_POST, 1);
   curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe");
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_003.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_003.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_003.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_003.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_003.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_003.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_003.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_004.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_004.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_004.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_004.php
index 41765b94b..224fd14f0 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_004.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_004.php
@@ -17,7 +17,7 @@
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_REFERER, 'http://www.refer.er');
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_004.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_004.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_004.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_004.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_004.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_004.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_004.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_005.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_005.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_005.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_005.php
index f98de6ae8..338dc9a54 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_005.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_005.php
@@ -17,7 +17,7 @@
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_USERAGENT, 'cURL phpt');
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_005.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_005.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_005.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_005.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_005.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_005.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_005.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_006.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_006.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_006.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_006.php
index 812cec14b..11d724e9e 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_006.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_006.php
@@ -19,7 +19,7 @@
     echo 'Data: '.$data;
     return strlen ($data);
   });
-  
+
   curl_exec($ch);
   curl_close($ch);
 ?>
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_006.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_006.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_006.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_006.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_006.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_006.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_006.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_007.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_007.php.skipif
index 67e8e679a..ea8bd0a5a 100644
--- a/hphp/test/zend/good/ext/curl/tests/curl_basic_007.php.skipif
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_007.php.skipif
@@ -1 +1,2 @@
-<?php if (!extension_loaded("curl")) print "skip"; ?>
\ No newline at end of file
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_009.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_009.php.skipif
index 67e8e679a..ea8bd0a5a 100644
--- a/hphp/test/zend/good/ext/curl/tests/curl_basic_009.php.skipif
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_009.php.skipif
@@ -1 +1,2 @@
-<?php if (!extension_loaded("curl")) print "skip"; ?>
\ No newline at end of file
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_011.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_011.php
similarity index 92%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_011.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_011.php
index f28147642..7026b310f 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_011.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_011.php
@@ -15,9 +15,9 @@
 
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-  curl_setopt($ch, CURLOPT_COOKIE, 'foo=bar');    
+  curl_setopt($ch, CURLOPT_COOKIE, 'foo=bar');
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_011.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_011.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_011.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_011.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_011.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_011.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_011.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_012.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_012.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_012.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_012.php
index 522296e10..c090f7c38 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_012.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_012.php
@@ -17,7 +17,7 @@
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_012.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_012.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_012.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_012.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_012.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_012.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_012.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_013.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_013.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_013.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_013.php
index f4ca4d4e0..884b02cad 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_013.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_013.php
@@ -17,7 +17,7 @@
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_013.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_013.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_013.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_013.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_013.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_013.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_013.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_015.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_015.php.skipif
index 87da4fb58..ea8bd0a5a 100644
--- a/hphp/test/zend/good/ext/curl/tests/curl_basic_015.php.skipif
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_015.php.skipif
@@ -1 +1,2 @@
-<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?>
\ No newline at end of file
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_017.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_017.php
similarity index 93%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_017.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_017.php
index 818f044ea..aa5e9da35 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_017.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_017.php
@@ -1,10 +1,10 @@
 <?php
 /* Prototype  : bool curl_multi_exec(resource ch)
- * Description: Perform a cURL session 
+ * Description: Perform a cURL session
  * Source code: ext/curl/multi.c
- * Alias to functions: 
+ * Alias to functions:
  */
-	
+
   $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
 
   // start testing
@@ -16,33 +16,33 @@
     1 => curl_init(),
     2 => curl_init(),
   );
-  
+
   ob_start(); // start output buffering
-  
+
   curl_setopt($chs[0], CURLOPT_URL, $url); //set the url we want to use
   curl_setopt($chs[1], CURLOPT_URL, $url); //set the url we want to use
   curl_setopt($chs[2], CURLOPT_URL, $url); //set the url we want to use
-  
+
   $mh = curl_multi_init();
-  
+
   // add handlers
   curl_multi_add_handle($mh, $chs[0]);
   curl_multi_add_handle($mh, $chs[1]);
   curl_multi_add_handle($mh, $chs[2]);
-  
+
   $running=null;
   //execute the handles
   $state = null;
   do {
     $state = curl_multi_exec($mh, $running);
   } while ($running > 0);
-  
+
   //close the handles
   curl_multi_remove_handle($mh, $chs[0]);
   curl_multi_remove_handle($mh, $chs[1]);
   curl_multi_remove_handle($mh, $chs[2]);
   curl_multi_close($mh);
-  
+
   $curl_content = ob_get_contents();
   ob_end_clean();
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_017.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_017.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_017.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_017.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_017.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_017.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_017.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_018.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_018.php
similarity index 97%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_018.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_018.php
index ef8da4c56..4e3f86442 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_018.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_018.php
@@ -4,7 +4,7 @@
  * Source code: ext/curl/interface.c
  * Alias to functions:
  */
-	
+
   $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
 
   // start testing
@@ -16,25 +16,25 @@
     1 => curl_init(),
     2 => curl_init(),
   );
-  
+
   ob_start(); // start output buffering
-  
+
   $options = array(
     CURLOPT_RETURNTRANSFER => 1,
     CURLOPT_URL => $url,
   );
-  
+
   curl_setopt_array($chs[0], $options); //set the options
   curl_setopt_array($chs[1], $options); //set the options
   curl_setopt_array($chs[2], $options); //set the options
-  
+
   $mh = curl_multi_init();
-  
+
   // add handlers
   curl_multi_add_handle($mh, $chs[0]);
   curl_multi_add_handle($mh, $chs[1]);
   curl_multi_add_handle($mh, $chs[2]);
-  
+
   $running=null;
   //execute the handles
   do {
@@ -45,14 +45,14 @@
   $curl_content .= curl_multi_getcontent($chs[0]);
   $curl_content .= curl_multi_getcontent($chs[1]);
   $curl_content .= curl_multi_getcontent($chs[2]);
-  
+
   //close the handles
   curl_multi_remove_handle($mh, $chs[0]);
   curl_multi_remove_handle($mh, $chs[1]);
   curl_multi_remove_handle($mh, $chs[2]);
   curl_multi_close($mh);
-  
+
   var_dump( $curl_content );
-  
+
 ?>
 ===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_018.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_018.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_018.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_018.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_018.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_018.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_018.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_019.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_019.php
similarity index 98%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_019.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_019.php
index 2519c9d2e..4d2d7b17d 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_basic_019.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_019.php
@@ -8,7 +8,7 @@
   curl_exec($ch);
   $info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
   var_dump($url == $info);
-  
+
   curl_close($ch);
 ?>
 ===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_019.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_019.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_019.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_019.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_019.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_019.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_019.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_020.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_020.php
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_020.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_020.php
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_020.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_020.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_020.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_020.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_020.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_020.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_020.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_021.php b/hphp/test/zend/good/ext/curl/tests/curl_basic_021.php
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_021.php
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_021.php
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_basic_021.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_basic_021.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_basic_021.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_basic_021.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_basic_021.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_basic_021.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_basic_021.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_001.php b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_001.php
similarity index 98%
rename from hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_001.php
rename to hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_001.php
index e70c5c21b..328c5dc4e 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_001.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_001.php
@@ -10,10 +10,10 @@
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $copy = curl_copy_handle($ch);
   curl_close($ch);
-  
+
   $curl_content = curl_exec($copy);
   curl_close($copy);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_001.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_001.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_001.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_001.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_001.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_001.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_001.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_004.php b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_004.php
similarity index 91%
rename from hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_004.php
rename to hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_004.php
index 59bbc1ba1..a5b28de1d 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_004.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_004.php
@@ -10,13 +10,13 @@
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
-  
+
+
   $curl_content = curl_exec($ch);
   $copy = curl_copy_handle($ch);
   curl_close($ch);
-  
-  $curl_content_copy = curl_exec($copy); 
+
+  $curl_content_copy = curl_exec($copy);
   curl_close($copy);
 
   var_dump( $curl_content_copy );
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_004.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_004.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_004.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_004.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_004.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_004.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_004.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_006.php b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_006.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_006.php
rename to hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_006.php
index 2711b252c..5022ec0c6 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_006.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_006.php
@@ -11,7 +11,7 @@
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_USERAGENT, 'cURL phpt');
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $copy = curl_copy_handle($ch);
 
   var_dump( curl_exec($ch) );
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_006.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_006.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_006.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_006.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_006.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_006.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_006.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_007.php b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_007.php
similarity index 99%
rename from hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_007.php
rename to hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_007.php
index ed000afd1..281083886 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_007.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_007.php
@@ -12,10 +12,10 @@
   curl_setopt($ch, CURLOPT_POSTFIELDS, array("Hello" => "World", "Foo" => "Bar", "Person" => "John Doe"));
   curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:')); // Disable Expect: header (lighttpd does not support it :)
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $copy = curl_copy_handle($ch);
   curl_close($ch);
- 
+
   $curl_content = curl_exec($copy);
   curl_close($copy);
 
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_007.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_007.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_copy_handle_basic_007.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_007.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_007.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_007.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_copy_handle_basic_007.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_multi_getcontent_basic3.php b/hphp/test/zend/good/ext/curl/tests/curl_multi_getcontent_basic3.php
similarity index 90%
rename from hphp/test/zend/bad/ext/curl/tests/curl_multi_getcontent_basic3.php
rename to hphp/test/zend/good/ext/curl/tests/curl_multi_getcontent_basic3.php
index 75b96e3d3..58344e997 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_multi_getcontent_basic3.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_multi_getcontent_basic3.php
@@ -2,7 +2,7 @@
 	//CURL_MULTI_GETCONTENT TEST
 
 	//CREATE RESOURCES
- 	$ch1=curl_init();
+	$ch1=curl_init();
 	$ch2=curl_init();
 
 	//SET URL AND OTHER OPTIONS
@@ -11,7 +11,7 @@
 	curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
 	curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
-	
+
 	//CREATE MULTIPLE CURL HANDLE
 	$mh=curl_multi_init();
 
@@ -29,9 +29,9 @@
         $results2=curl_multi_getcontent($ch2);
 
 	//CLOSE
- 	curl_multi_remove_handle($mh,$ch1);
+	curl_multi_remove_handle($mh,$ch1);
 	curl_multi_remove_handle($mh,$ch2);
-	curl_multi_close($mh);	
+	curl_multi_close($mh);
 
 	echo $results1;
 	echo $results2;
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_multi_getcontent_basic3.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_multi_getcontent_basic3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_multi_getcontent_basic3.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_multi_getcontent_basic3.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_multi_getcontent_basic3.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_multi_getcontent_basic3.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_multi_getcontent_basic3.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php b/hphp/test/zend/good/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php
similarity index 87%
rename from hphp/test/zend/bad/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php
rename to hphp/test/zend/good/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php
index bde74f0f5..0ddd02851 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php
+++ b/hphp/test/zend/good/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php
@@ -1,9 +1,9 @@
-<?php    
-function custom_readfunction($oCurl, $hReadHandle, $iMaxOut) 
+<?php
+function custom_readfunction($oCurl, $hReadHandle, $iMaxOut)
 {
   $sData = fread($hReadHandle,$iMaxOut-10); # -10 to have space to add "custom:"
   if (!empty($sData))
-  { 
+  {
     $sData = "custom:".$sData;
   }
   return $sData;
@@ -25,9 +25,9 @@ curl_setopt($oCurl, CURLOPT_INFILE,       $hReadHandle );
 curl_exec($oCurl);
 curl_close($oCurl);
 
-fclose ($hReadHandle); 
+fclose ($hReadHandle);
 
-$sOutput = file_get_contents($sWriteFile); 
+$sOutput = file_get_contents($sWriteFile);
 var_dump($sOutput);
 ?>
 ===DONE===
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.expectf
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.skipif
similarity index 81%
rename from hphp/test/zend/bad/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.skipif
rename to hphp/test/zend/good/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.skipif
index 2802ce0c5..10d1f9634 100644
--- a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.skipif
+++ b/hphp/test/zend/good/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.php.skipif
@@ -1,3 +1,3 @@
-<?php 
-if (!extension_loaded("curl")) print "skip cURL extension not loaded"; 
+<?php
+if (!extension_loaded("curl")) print "skip cURL extension not loaded";
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_basic003.php b/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic003.php
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_setopt_basic003.php
rename to hphp/test/zend/good/ext/curl/tests/curl_setopt_basic003.php
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_basic003.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic003.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_setopt_basic003.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_setopt_basic003.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic003.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic003.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic003.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_basic004.php b/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic004.php
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_setopt_basic004.php
rename to hphp/test/zend/good/ext/curl/tests/curl_setopt_basic004.php
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_setopt_basic004.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic004.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_setopt_basic004.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_setopt_basic004.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic004.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic004.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_setopt_basic004.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_writeheader_callback.php b/hphp/test/zend/good/ext/curl/tests/curl_writeheader_callback.php
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_writeheader_callback.php
rename to hphp/test/zend/good/ext/curl/tests/curl_writeheader_callback.php
diff --git a/hphp/test/zend/bad/ext/curl/tests/curl_writeheader_callback.php.expectf b/hphp/test/zend/good/ext/curl/tests/curl_writeheader_callback.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext/curl/tests/curl_writeheader_callback.php.expectf
rename to hphp/test/zend/good/ext/curl/tests/curl_writeheader_callback.php.expectf
diff --git a/hphp/test/zend/good/ext/curl/tests/curl_writeheader_callback.php.skipif b/hphp/test/zend/good/ext/curl/tests/curl_writeheader_callback.php.skipif
new file mode 100644
index 000000000..4af715e6b
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/curl_writeheader_callback.php.skipif
@@ -0,0 +1,3 @@
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
diff --git a/hphp/test/zend/good/ext/curl/tests/responder/get.php b/hphp/test/zend/good/ext/curl/tests/responder/get.php
new file mode 100644
index 000000000..7fd1a905e
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/responder/get.php
@@ -0,0 +1,39 @@
+<?php
+  $test = isset($_GET['test']) ? $_GET['test'] : null;
+  switch($test) {
+    case 'post':
+      var_dump($_POST);
+      break;
+    case 'getpost':
+      var_dump($_GET);
+      var_dump($_POST);
+      break;
+    case 'referer':
+      echo $_SERVER['HTTP_REFERER'];
+      break;
+    case 'useragent':
+      echo $_SERVER['HTTP_USER_AGENT'];
+      break;
+    case 'httpversion':
+      echo $_SERVER['SERVER_PROTOCOL'];
+      break;
+    case 'cookie':
+      echo $_COOKIE['foo'];
+      break;
+    case 'encoding':
+      echo $_SERVER['HTTP_ACCEPT_ENCODING'];
+      break;
+    case 'contenttype':
+      header('Content-Type: text/plain;charset=utf-8');
+      break;
+    case 'file':
+      if (isset($_FILES['file'])) {
+          echo $_FILES['file']['name'] . '|' . $_FILES['file']['type'];
+      }
+      break;
+    default:
+      echo "Hello World!\n";
+      echo "Hello World!";
+      break;
+  }
+?>
diff --git a/hphp/test/zend/good/ext/curl/tests/responder/get.php.skipif b/hphp/test/zend/good/ext/curl/tests/responder/get.php.skipif
new file mode 100644
index 000000000..5c559ecb3
--- /dev/null
+++ b/hphp/test/zend/good/ext/curl/tests/responder/get.php.skipif
@@ -0,0 +1 @@
+always skip - not a test
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 1f81e9a17..76800c860 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -423,6 +423,7 @@ other_files = (
     '/ext/bz2/tests/004_1.txt.bz2',
     '/ext/bz2/tests/004_2.txt.bz2',
     '/ext/calendar/tests/skipif.inc',
+    '/ext/curl/tests/responder/get.php',
     '/ext/curl/tests/curl_testdata1.txt',
     '/ext/curl/tests/curl_testdata2.txt',
     '/ext/date/tests/DateTime_data-absolute.inc',