diff --git a/MANIFEST.in b/MANIFEST.in
index a80f7e4..7f2b5da 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,17 +17,18 @@
 include examples/wxTerminal.py
 include examples/wxTerminal.wxg
 
+include test/handlers/__init__.py
+include test/handlers/protocol_test.py
 include test/run_all_tests.py
-include test/test.py
 include test/test_advanced.py
 include test/test_high_load.py
 include test/test_iolib.py
+include test/test.py
 include test/test_readline.py
+include test/test_rfc2217.py
 include test/test_rs485.py
 include test/test_settings_dict.py
 include test/test_url.py
-include test/handlers/__init__.py
-include test/handlers/protocol_test.py
 
 include documentation/*.rst
 include documentation/pyserial.png
diff --git a/examples/rfc2217_server.py b/examples/rfc2217_server.py
index 10c47c5..c94b837 100755
--- a/examples/rfc2217_server.py
+++ b/examples/rfc2217_server.py
@@ -192,3 +192,4 @@
             logging.error(str(msg))
 
     logging.info('--- exit ---')
+
diff --git a/test/test_rfc2217.py b/test/test_rfc2217.py
new file mode 100644
index 0000000..05bee83
--- /dev/null
+++ b/test/test_rfc2217.py
@@ -0,0 +1,31 @@
+#! /usr/bin/env python
+#
+# This file is part of pySerial - Cross platform serial port support for Python
+# (C) 2015 Chris Liechti <cliechti@gmx.net>
+#
+# SPDX-License-Identifier:    BSD-3-Clause
+"""\
+Test RFC 2217 related functionality.
+"""
+
+import unittest
+import serial
+import serial.rfc2217
+
+class Test_RFC2217(unittest.TestCase):
+    """Test RFC 2217 related functionality"""
+
+    def test_failed_connection(self):
+        # connection to closed port
+        s = serial.serial_for_url('rfc2217://127.99.99.99:2217', do_not_open=True)
+        self.failUnlessRaises(serial.SerialException, s.open)
+        self.assertFalse(s.is_open)
+
+
+if __name__ == '__main__':
+    import sys
+    sys.stdout.write(__doc__)
+    sys.stdout.write("Testing connection on localhost\n")
+    sys.argv[1:] = ['-v']
+    # When this module is executed from the command-line, it runs all its tests
+    unittest.main()