diff -Nru 2ping-4.0/2ping.spec 2ping-4.0.1/2ping.spec
--- 2ping-4.0/2ping.spec	2017-07-22 03:53:29.000000000 +0000
+++ 2ping-4.0.1/2ping.spec	2017-07-22 15:53:44.000000000 +0000
@@ -1,5 +1,5 @@
 Name:           2ping
-Version:        4.0
+Version:        4.0.1
 Release:        1%{?dist}
 Summary:        Bi-directional ping utility
 License:        GPLv2+
diff -Nru 2ping-4.0/ChangeLog 2ping-4.0.1/ChangeLog
--- 2ping-4.0/ChangeLog	2017-07-22 03:53:29.000000000 +0000
+++ 2ping-4.0.1/ChangeLog	2017-07-22 15:53:44.000000000 +0000
@@ -1,3 +1,6 @@
+2ping 4.0.1 (2017-07-22)
+ * Fixed unit tests causing test failure in certain conditions.
+
 2ping 4.0 (2017-07-22)
  * Rewrite from Python 2 to Python 3 (3.4 or higher).
  * Fixed hmac-sha256 handling, added hmac-sha512.
diff -Nru 2ping-4.0/debian/changelog 2ping-4.0.1/debian/changelog
--- 2ping-4.0/debian/changelog	2017-07-22 06:06:53.000000000 +0000
+++ 2ping-4.0.1/debian/changelog	2017-07-22 15:58:10.000000000 +0000
@@ -1,3 +1,9 @@
+2ping (4.0.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #869326)
+
+ -- Ryan Finnie <ryan@finnie.org>  Sat, 22 Jul 2017 15:58:10 +0000
+
 2ping (4.0-2) unstable; urgency=medium
 
   * Fix python3-all Build-Dependencies
diff -Nru 2ping-4.0/setup.py 2ping-4.0.1/setup.py
--- 2ping-4.0/setup.py	2017-07-22 03:53:29.000000000 +0000
+++ 2ping-4.0.1/setup.py	2017-07-22 15:53:44.000000000 +0000
@@ -12,7 +12,7 @@
     name='2ping',
     description='2ping a bi-directional ping utility',
     long_description=read('README'),
-    version='4.0',
+    version='4.0.1',
     license='GPLv2+',
     platforms=['Unix'],
     author='Ryan Finnie',
diff -Nru 2ping-4.0/tests/test_best_poller.py 2ping-4.0.1/tests/test_best_poller.py
--- 2ping-4.0/tests/test_best_poller.py	2017-07-22 03:53:29.000000000 +0000
+++ 2ping-4.0.1/tests/test_best_poller.py	2017-07-22 15:53:44.000000000 +0000
@@ -14,6 +14,7 @@
             poller.f_dict[s.fileno()],
             s
         )
+        s.close()
 
     def test_register_multiple(self):
         poller = best_poller.best_poller()
@@ -25,6 +26,8 @@
             (poller.f_dict[s1.fileno()], poller.f_dict[s2.fileno()]),
             (s1, s2)
         )
+        s1.close()
+        s2.close()
 
     def test_register_idempotent(self):
         poller = best_poller.best_poller()
@@ -35,6 +38,7 @@
             len(poller.f_dict),
             1
         )
+        s.close()
 
     def test_available_pollers(self):
         self.assertTrue(len(best_poller.available_pollers()) > 0)
diff -Nru 2ping-4.0/tests/test_cli.py 2ping-4.0.1/tests/test_cli.py
--- 2ping-4.0/tests/test_cli.py	2017-07-22 03:53:29.000000000 +0000
+++ 2ping-4.0.1/tests/test_cli.py	2017-07-22 15:53:44.000000000 +0000
@@ -7,8 +7,10 @@
 import time
 import signal
 import random
+from twoping import monotonic_clock
 
 
+@unittest.skipUnless(hasattr(os, 'fork'), 'CLI tests require os.fork()')
 class TestCLI(unittest.TestCase):
     bind_address = '127.0.0.1'
     port = None
@@ -56,7 +58,7 @@
             self.fail(e.output)
 
     def test_notice(self):
-        self.run_listener_client(['--count=1', '--notice=foo ☃'])
+        self.run_listener_client(['--count=1', '--notice=Notice text'])
 
     def test_random(self):
         self.run_listener_client(['--count=1', '--send-random=32'])
@@ -64,14 +66,15 @@
     def test_time(self):
         self.run_listener_client(['--count=1', '--send-time'])
 
+    @unittest.skipUnless(monotonic_clock.get_clock_info('clock').monotonic, 'Monotonic clock required')
     def test_monotonic_clock(self):
         self.run_listener_client(['--count=1', '--send-monotonic-clock'])
 
     def test_adaptive(self):
-        self.run_listener_client(['--adaptive', '--deadline=5'])
+        self.run_listener_client(['--adaptive', '--deadline=3'])
 
     def test_flood(self):
-        self.run_listener_client(['--flood', '--deadline=5'])
+        self.run_listener_client(['--flood', '--deadline=3'])
 
     def test_hmac_md5(self):
         self.run_listener_client(
diff -Nru 2ping-4.0/twoping/__init__.py 2ping-4.0.1/twoping/__init__.py
--- 2ping-4.0/twoping/__init__.py	2017-07-22 03:53:29.000000000 +0000
+++ 2ping-4.0.1/twoping/__init__.py	2017-07-22 15:53:44.000000000 +0000
@@ -16,4 +16,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-__version__ = '4.0'
+__version__ = '4.0.1'