diff --git a/build.xml b/build.xml
index 1dbc20e..7011fd4 100644
--- a/build.xml
+++ b/build.xml
@@ -301,6 +301,7 @@
         <apply-diff src="test/simple" mod="${test.dir}/simple" name="test-https-strict.js"/>
         <apply-diff src="test/simple" mod="${test.dir}/simple" name="test-module-loading.js"/>
         <apply-diff src="test/simple" mod="${test.dir}/simple" name="test-net-pingpong.js"/>
+        <apply-diff src="test/simple" mod="${test.dir}/simple" name="test-net-GH-5504.js"/>
         <apply-diff src="test/simple" mod="${test.dir}/simple" name="test-net-server-address.js"/>
         <apply-diff src="test/simple" mod="${test.dir}/simple" name="test-net-server-unref.js"/>
         <apply-diff src="test/simple" mod="${test.dir}/simple" name="test-net-settimeout.js"/>
@@ -384,6 +385,7 @@
         <apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-http-many-keep-alive-connections.js"/>
         <apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-https-strict.js"/>
         <apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-module-loading.js"/>
+        <apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-net-GH-5504.js"/>
         <apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-net-pingpong.js"/>
         <apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-net-server-address.js"/>
         <apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-net-server-unref.js"/>
diff --git a/patches/test/simple/test-net-GH-5504.js.patch b/patches/test/simple/test-net-GH-5504.js.patch
new file mode 100644
index 0000000..c6aa7b4
--- /dev/null
+++ b/patches/test/simple/test-net-GH-5504.js.patch
@@ -0,0 +1,11 @@
+--- ../node/test/simple/test-net-GH-5504.js	2013-08-22 13:55:29.000000000 +0200
++++ test/simple/test-net-GH-5504.js	2014-01-03 14:57:59.000000000 +0100
+@@ -88,7 +88,7 @@
+     setTimeout(function() {
+       throw new Error('hang');
+     });
+-  }, 1000).unref();
++  }, 30000).unref();
+ 
+   var s = spawn(node, [__filename, 'server'], opt);
+   var c;
diff --git a/project.properties b/project.properties
index 2c316ec..d4dabee 100644
--- a/project.properties
+++ b/project.properties
@@ -381,6 +381,7 @@ source.test.simple.list = \
     test-net-during-close.js \
     test-net-eaddrinuse.js \
     test-net-end-without-connect.js \
+    test-net-GH-5504.js \
     test-net-isip.js \
     test-net-keepalive.js \
     test-net-large-string.js \