diff --git a/test_requests.py b/test_requests.py
index 89d9c75b..926abe2e 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -29,7 +29,7 @@ from requests.structures import CaseInsensitiveDict
 from requests.sessions import SessionRedirectMixin
 from requests.models import urlencode
 from requests.hooks import default_hooks
-from dummyserver.server import Server
+from testserver.server import Server
 import socket
 
 try:
@@ -1738,7 +1738,7 @@ def test_vendor_aliases():
     with pytest.raises(ImportError):
         from requests.packages import webbrowser
 
-class TestDummyServer(unittest.TestCase):
+class TestTestServer(unittest.TestCase):
     def test_basic(self):
         question = b"sucess?"
         answer = b"yeah, success"
diff --git a/testserver/.server.py.swo b/testserver/.server.py.swo
new file mode 100644
index 00000000..eb2d89d9
Binary files /dev/null and b/testserver/.server.py.swo differ
diff --git a/dummyserver/__init__.py b/testserver/__init__.py
similarity index 100%
rename from dummyserver/__init__.py
rename to testserver/__init__.py
diff --git a/dummyserver/server.py b/testserver/server.py
similarity index 94%
rename from dummyserver/server.py
rename to testserver/server.py
index 22c5d90f..14349fb9 100644
--- a/dummyserver/server.py
+++ b/testserver/server.py
@@ -2,11 +2,8 @@
 
 import threading, socket
 
-
-
-
 class Server(threading.Thread):
-    """ Dummy server using for unit testing """
+    """ Basic socket server used for unit testing """
 
     def __init__(self, handler, host='localhost', port=8021):
         threading.Thread.__init__(self)