diff --git a/tests/integration/tools/build_servers.py b/bootstrapvz/remote/build_servers.py
similarity index 100%
rename from tests/integration/tools/build_servers.py
rename to bootstrapvz/remote/build_servers.py
diff --git a/tests/integration/tools/__init__.py b/tests/integration/tools/__init__.py
index 11efa2d..7ccf1cc 100644
--- a/tests/integration/tools/__init__.py
+++ b/tests/integration/tools/__init__.py
@@ -1,6 +1,6 @@
 from bootstrapvz.common.tools import load_data
-from build_servers import LocalBuildServer
-from build_servers import RemoteBuildServer
+from bootstrapvz.remote.build_servers import LocalBuildServer
+from bootstrapvz.remote.build_servers import RemoteBuildServer
 
 # Register deserialization handlers for objects
 # that will pass between server and client