diff --git a/pymongo/pool.py b/pymongo/pool.py
index cb03558df..7014ed2a1 100644
--- a/pymongo/pool.py
+++ b/pymongo/pool.py
@@ -234,7 +234,7 @@ class Pool:
           - `pair`: optional (hostname, port) tuple
         """
         # We use the pid here to avoid issues with fork / multiprocessing.
-        # See test.test_connection:TestClient.test_fork for an example of
+        # See test.test_client:TestClient.test_fork for an example of
         # what could go wrong otherwise
         if self.pid != os.getpid():
             self.reset()
diff --git a/test/__init__.py b/test/__init__.py
index 7e487418b..4e8c97088 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -15,7 +15,7 @@
 """Clean up databases after running `nosetests`.
 """
 
-from test.test_connection import get_client
+from test.test_client import get_client
 
 
 def teardown():
diff --git a/test/test_binary.py b/test/test_binary.py
index 202930e7f..655ee449c 100644
--- a/test/test_binary.py
+++ b/test/test_binary.py
@@ -33,7 +33,7 @@ from bson.binary import *
 from bson.py3compat import b, binary_type
 from bson.son import SON
 from nose.plugins.skip import SkipTest
-from test.test_connection import get_client
+from test.test_client import get_client
 
 
 class TestBinary(unittest.TestCase):
diff --git a/test/test_connection.py b/test/test_client.py
similarity index 100%
rename from test/test_connection.py
rename to test/test_client.py
diff --git a/test/test_collection.py b/test/test_collection.py
index d69128b5b..a8f9ae921 100644
--- a/test/test_collection.py
+++ b/test/test_collection.py
@@ -43,7 +43,7 @@ from pymongo.errors import (ConfigurationError,
                             InvalidOperation,
                             OperationFailure,
                             TimeoutError)
-from test.test_connection import get_client
+from test.test_client import get_client
 from test.utils import is_mongos, joinall
 from test import (qcheck,
                   version)
diff --git a/test/test_cursor.py b/test/test_cursor.py
index 8710ca09c..e1c3b83ae 100644
--- a/test/test_cursor.py
+++ b/test/test_cursor.py
@@ -31,7 +31,7 @@ from pymongo.database import Database
 from pymongo.errors import (InvalidOperation,
                             OperationFailure)
 from test import version
-from test.test_connection import get_client
+from test.test_client import get_client
 
 
 class TestCursor(unittest.TestCase):
diff --git a/test/test_database.py b/test/test_database.py
index e068f1201..d952a5c21 100644
--- a/test/test_database.py
+++ b/test/test_database.py
@@ -42,7 +42,7 @@ from pymongo.son_manipulator import (AutoReference,
                                      ObjectIdShuffler)
 from test import version
 from test.utils import is_mongos, server_started_with_auth
-from test.test_connection import get_client
+from test.test_client import get_client
 
 
 class TestDatabase(unittest.TestCase):
diff --git a/test/test_grid_file.py b/test/test_grid_file.py
index 31e95ba17..5571d5240 100644
--- a/test/test_grid_file.py
+++ b/test/test_grid_file.py
@@ -35,7 +35,7 @@ from gridfs.grid_file import (DEFAULT_CHUNK_SIZE,
                               GridOut)
 from gridfs.errors import (NoFile,
                            UnsupportedAPI)
-from test.test_connection import get_client
+from test.test_client import get_client
 from test import qcheck
 
 
diff --git a/test/test_gridfs.py b/test/test_gridfs.py
index 998bb6c4b..4ebf10e00 100644
--- a/test/test_gridfs.py
+++ b/test/test_gridfs.py
@@ -22,7 +22,7 @@ sys.path[0:0] = [""]
 from pymongo.mongo_client import MongoClient
 from pymongo.errors import AutoReconnect
 from pymongo.read_preferences import ReadPreference
-from test.test_replica_set_connection import TestReplicaSetClientBase
+from test.test_replica_set_client import TestReplicaSetClientBase
 
 import datetime
 import unittest
@@ -33,7 +33,7 @@ import gridfs
 from bson.py3compat import b, StringIO
 from gridfs.errors import (FileExists,
                            NoFile)
-from test.test_connection import get_client
+from test.test_client import get_client
 from test.utils import joinall
 
 
diff --git a/test/test_json_util.py b/test/test_json_util.py
index eef09efa8..eef8fd701 100644
--- a/test/test_json_util.py
+++ b/test/test_json_util.py
@@ -35,7 +35,7 @@ from bson.objectid import ObjectId
 from bson.timestamp import Timestamp
 from bson.tz_util import utc
 
-from test.test_connection import get_client
+from test.test_client import get_client
 
 PY3 = sys.version_info[0] == 3
 
diff --git a/test/test_legacy_connections.py b/test/test_legacy_connections.py
index e174a5bf8..22b3e4019 100644
--- a/test/test_legacy_connections.py
+++ b/test/test_legacy_connections.py
@@ -26,8 +26,8 @@ from pymongo.connection import Connection
 from pymongo.replica_set_connection import ReplicaSetConnection
 from pymongo.errors import ConfigurationError
 
-from test.test_replica_set_connection import TestReplicaSetClientBase
-from test.test_connection import host, port
+from test.test_replica_set_client import TestReplicaSetClientBase
+from test.test_client import host, port
 
 
 class TestConnection(unittest.TestCase):
diff --git a/test/test_master_slave_connection.py b/test/test_master_slave_connection.py
index d794e0676..e65fab116 100644
--- a/test/test_master_slave_connection.py
+++ b/test/test_master_slave_connection.py
@@ -35,7 +35,7 @@ from pymongo.mongo_client import MongoClient
 from pymongo.collection import Collection
 from pymongo.master_slave_connection import MasterSlaveConnection
 from test.utils import TestRequestMixin
-from test.test_connection import host, port
+from test.test_client import host, port
 
 class TestMasterSlaveConnection(unittest.TestCase, TestRequestMixin):
 
diff --git a/test/test_pooling.py b/test/test_pooling.py
index b2a2b3202..580084a89 100644
--- a/test/test_pooling.py
+++ b/test/test_pooling.py
@@ -23,7 +23,7 @@ sys.path[0:0] = [""]
 
 from nose.plugins.skip import SkipTest
 
-from test.test_connection import host, port
+from test.test_client import host, port
 from test.test_pooling_base import (
     _TestPooling, _TestMaxPoolSize, _TestPoolSocketSharing, one)
 
diff --git a/test/test_pooling_base.py b/test/test_pooling_base.py
index 299bd6fd4..d27df3c11 100644
--- a/test/test_pooling_base.py
+++ b/test/test_pooling_base.py
@@ -32,7 +32,7 @@ from pymongo.mongo_client import MongoClient
 from pymongo.pool import Pool, NO_REQUEST, NO_SOCKET_YET, SocketInfo
 from pymongo.errors import ConfigurationError
 from test import version
-from test.test_connection import get_client, host, port
+from test.test_client import get_client, host, port
 from test.utils import delay, is_mongos, one
 
 N = 50
diff --git a/test/test_pooling_gevent.py b/test/test_pooling_gevent.py
index 6c4996af0..b021021e9 100644
--- a/test/test_pooling_gevent.py
+++ b/test/test_pooling_gevent.py
@@ -20,7 +20,7 @@ from nose.plugins.skip import SkipTest
 
 from pymongo import pool
 from test.utils import looplet
-from test.test_connection import host, port
+from test.test_client import host, port
 from test.test_pooling_base import (
     _TestPooling, _TestMaxPoolSize, _TestPoolSocketSharing)
 
diff --git a/test/test_read_preferences.py b/test/test_read_preferences.py
index b04ed2a78..250852df4 100644
--- a/test/test_read_preferences.py
+++ b/test/test_read_preferences.py
@@ -29,8 +29,8 @@ from pymongo.read_preferences import (ReadPreference, modes, MovingAverage,
                                       secondary_ok_commands)
 from pymongo.errors import ConfigurationError
 
-from test.test_replica_set_connection import TestReplicaSetClientBase
-from test.test_connection import get_client, host, port
+from test.test_replica_set_client import TestReplicaSetClientBase
+from test.test_client import get_client, host, port
 from test import version, utils
 
 
diff --git a/test/test_replica_set_connection.py b/test/test_replica_set_client.py
similarity index 100%
rename from test/test_replica_set_connection.py
rename to test/test_replica_set_client.py
diff --git a/test/test_son_manipulator.py b/test/test_son_manipulator.py
index 478a9c738..c1e54e7c0 100644
--- a/test/test_son_manipulator.py
+++ b/test/test_son_manipulator.py
@@ -26,7 +26,7 @@ from pymongo.son_manipulator import (NamespaceInjector,
                                      ObjectIdInjector,
                                      ObjectIdShuffler,
                                      SONManipulator)
-from test.test_connection import get_client
+from test.test_client import get_client
 from test import qcheck
 
 
diff --git a/test/test_threads.py b/test/test_threads.py
index a743e55c4..84397a20f 100644
--- a/test/test_threads.py
+++ b/test/test_threads.py
@@ -21,7 +21,7 @@ import traceback
 from nose.plugins.skip import SkipTest
 
 from test.utils import server_started_with_auth, joinall, RendezvousThread
-from test.test_connection import get_client
+from test.test_client import get_client
 from pymongo.mongo_client import MongoClient
 from pymongo.replica_set_connection import MongoReplicaSetClient
 from pymongo.pool import SocketInfo, _closed
diff --git a/test/test_threads_replica_set_connection.py b/test/test_threads_replica_set_connection.py
index 53646f74b..d262a3c1e 100644
--- a/test/test_threads_replica_set_connection.py
+++ b/test/test_threads_replica_set_connection.py
@@ -19,7 +19,7 @@ import unittest
 from pymongo.mongo_replica_set_client import MongoReplicaSetClient
 
 from test.test_threads import BaseTestThreads, BaseTestThreadsAuth
-from test.test_replica_set_connection import (TestReplicaSetClientBase,
+from test.test_replica_set_client import (TestReplicaSetClientBase,
                                               pair)