diff --git a/test/simple/test-timers-non-integer-delay.js b/test/simple/test-timers-non-integer-delay.js
new file mode 100644
index 000000000000..5e6a48253a0b
--- /dev/null
+++ b/test/simple/test-timers-non-integer-delay.js
@@ -0,0 +1,51 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+/*
+ * This test makes sure that non-integer timer delays do not make the process
+ * hang. See https://github.com/joyent/node/issues/8065 and
+ * https://github.com/joyent/node/issues/8068 which have been fixed by
+ * https://github.com/joyent/node/pull/8073.
+ *
+ * If the process hangs, this test will make the tests suite timeout,
+ * otherwise it will exit very quickly (after 50 timers with a short delay
+ * fire).
+ *
+ * We have to set at least several timers with a non-integer delay to
+ * reproduce the issue. Sometimes, a timer with a non-integer delay will
+ * expire correctly. 50 timers has always been more than enough to reproduce
+ * it 100%.
+ */
+
+var assert = require('assert');
+
+var TIMEOUT_DELAY     = 1.1;
+var NB_TIMEOUTS_FIRED = 50;
+
+var nbTimeoutFired = 0;
+var interval = setInterval(function() {
+  ++nbTimeoutFired;
+  if (nbTimeoutFired === NB_TIMEOUTS_FIRED) {
+    clearInterval(interval);
+    process.exit(0);
+  }
+}, TIMEOUT_DELAY);
+