diff --git a/lib/galaxy/test/base/__init__.py b/lib/galaxy/test/base/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/lib/galaxy/test/__init__.py b/test/base/__init__.py
similarity index 100%
rename from lib/galaxy/test/__init__.py
rename to test/base/__init__.py
diff --git a/lib/galaxy/test/base/twilltestcase.py b/test/base/twilltestcase.py
similarity index 100%
rename from lib/galaxy/test/base/twilltestcase.py
rename to test/base/twilltestcase.py
diff --git a/lib/galaxy/test/functional/__init__.py b/test/functional/__init__.py
similarity index 100%
rename from lib/galaxy/test/functional/__init__.py
rename to test/functional/__init__.py
diff --git a/lib/galaxy/test/functional/test_3A_GetData.py b/test/functional/test_3A_GetData.py
similarity index 100%
rename from lib/galaxy/test/functional/test_3A_GetData.py
rename to test/functional/test_3A_GetData.py
diff --git a/lib/galaxy/test/functional/test_3B_GetEncodeData.py b/test/functional/test_3B_GetEncodeData.py
similarity index 100%
rename from lib/galaxy/test/functional/test_3B_GetEncodeData.py
rename to test/functional/test_3B_GetEncodeData.py
diff --git a/lib/galaxy/test/functional/test_basic.py b/test/functional/test_basic.py
similarity index 100%
rename from lib/galaxy/test/functional/test_basic.py
rename to test/functional/test_basic.py
diff --git a/lib/galaxy/test/functional/test_datasource_tools.py b/test/functional/test_datasource_tools.py
similarity index 100%
rename from lib/galaxy/test/functional/test_datasource_tools.py
rename to test/functional/test_datasource_tools.py
diff --git a/lib/galaxy/test/functional/test_history.py b/test/functional/test_history.py
similarity index 100%
rename from lib/galaxy/test/functional/test_history.py
rename to test/functional/test_history.py
diff --git a/lib/galaxy/test/functional/test_operations.py b/test/functional/test_operations.py
similarity index 100%
rename from lib/galaxy/test/functional/test_operations.py
rename to test/functional/test_operations.py
diff --git a/lib/galaxy/test/functional/test_toolbox.py b/test/functional/test_toolbox.py
similarity index 100%
rename from lib/galaxy/test/functional/test_toolbox.py
rename to test/functional/test_toolbox.py