diff --git a/hsml/python/tests/__init__.py b/hsml/python/tests/__init__.py
deleted file mode 100644
index 5b0cd48e7..000000000
--- a/hsml/python/tests/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#   Copyright 2024 Logical Clocks AB
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
diff --git a/hsml/python/tests/conftest.py b/python/tests/conftest.py
similarity index 100%
rename from hsml/python/tests/conftest.py
rename to python/tests/conftest.py
diff --git a/hsml/python/tests/fixtures/__init__.py b/python/tests/fixtures/__init__.py
similarity index 100%
rename from hsml/python/tests/fixtures/__init__.py
rename to python/tests/fixtures/__init__.py
diff --git a/hsml/python/tests/fixtures/backend_fixtures.py b/python/tests/fixtures/backend_fixtures.py
similarity index 100%
rename from hsml/python/tests/fixtures/backend_fixtures.py
rename to python/tests/fixtures/backend_fixtures.py
diff --git a/hsml/python/tests/fixtures/inference_batcher_fixtures.json b/python/tests/fixtures/inference_batcher_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/inference_batcher_fixtures.json
rename to python/tests/fixtures/inference_batcher_fixtures.json
diff --git a/hsml/python/tests/fixtures/inference_endpoint_fixtures.json b/python/tests/fixtures/inference_endpoint_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/inference_endpoint_fixtures.json
rename to python/tests/fixtures/inference_endpoint_fixtures.json
diff --git a/hsml/python/tests/fixtures/inference_logger_fixtures.json b/python/tests/fixtures/inference_logger_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/inference_logger_fixtures.json
rename to python/tests/fixtures/inference_logger_fixtures.json
diff --git a/hsml/python/tests/fixtures/kafka_topic_fixtures.json b/python/tests/fixtures/kafka_topic_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/kafka_topic_fixtures.json
rename to python/tests/fixtures/kafka_topic_fixtures.json
diff --git a/hsml/python/tests/fixtures/model_fixtures.json b/python/tests/fixtures/model_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/model_fixtures.json
rename to python/tests/fixtures/model_fixtures.json
diff --git a/hsml/python/tests/fixtures/model_fixtures.py b/python/tests/fixtures/model_fixtures.py
similarity index 100%
rename from hsml/python/tests/fixtures/model_fixtures.py
rename to python/tests/fixtures/model_fixtures.py
diff --git a/hsml/python/tests/fixtures/predictor_fixtures.json b/python/tests/fixtures/predictor_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/predictor_fixtures.json
rename to python/tests/fixtures/predictor_fixtures.json
diff --git a/hsml/python/tests/fixtures/resources_fixtures.json b/python/tests/fixtures/resources_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/resources_fixtures.json
rename to python/tests/fixtures/resources_fixtures.json
diff --git a/hsml/python/tests/fixtures/tag_fixtures.json b/python/tests/fixtures/tag_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/tag_fixtures.json
rename to python/tests/fixtures/tag_fixtures.json
diff --git a/hsml/python/tests/fixtures/transformer_fixtures.json b/python/tests/fixtures/transformer_fixtures.json
similarity index 100%
rename from hsml/python/tests/fixtures/transformer_fixtures.json
rename to python/tests/fixtures/transformer_fixtures.json
diff --git a/hsml/python/tests/test_connection.py b/python/tests/test_connection.py
similarity index 100%
rename from hsml/python/tests/test_connection.py
rename to python/tests/test_connection.py
diff --git a/hsml/python/tests/test_constants.py b/python/tests/test_constants.py
similarity index 100%
rename from hsml/python/tests/test_constants.py
rename to python/tests/test_constants.py
diff --git a/hsml/python/tests/test_decorators.py b/python/tests/test_decorators.py
similarity index 100%
rename from hsml/python/tests/test_decorators.py
rename to python/tests/test_decorators.py
diff --git a/hsml/python/tests/test_deployable_component.py b/python/tests/test_deployable_component.py
similarity index 100%
rename from hsml/python/tests/test_deployable_component.py
rename to python/tests/test_deployable_component.py
diff --git a/hsml/python/tests/test_deployable_component_logs.py b/python/tests/test_deployable_component_logs.py
similarity index 100%
rename from hsml/python/tests/test_deployable_component_logs.py
rename to python/tests/test_deployable_component_logs.py
diff --git a/hsml/python/tests/test_deployment.py b/python/tests/test_deployment.py
similarity index 100%
rename from hsml/python/tests/test_deployment.py
rename to python/tests/test_deployment.py
diff --git a/hsml/python/tests/test_explicit_provenance.py b/python/tests/test_explicit_provenance.py
similarity index 100%
rename from hsml/python/tests/test_explicit_provenance.py
rename to python/tests/test_explicit_provenance.py
diff --git a/hsml/python/tests/test_inference_batcher.py b/python/tests/test_inference_batcher.py
similarity index 100%
rename from hsml/python/tests/test_inference_batcher.py
rename to python/tests/test_inference_batcher.py
diff --git a/hsml/python/tests/test_inference_endpoint.py b/python/tests/test_inference_endpoint.py
similarity index 100%
rename from hsml/python/tests/test_inference_endpoint.py
rename to python/tests/test_inference_endpoint.py
diff --git a/hsml/python/tests/test_inference_logger.py b/python/tests/test_inference_logger.py
similarity index 100%
rename from hsml/python/tests/test_inference_logger.py
rename to python/tests/test_inference_logger.py
diff --git a/hsml/python/tests/test_kafka_topic.py b/python/tests/test_kafka_topic.py
similarity index 100%
rename from hsml/python/tests/test_kafka_topic.py
rename to python/tests/test_kafka_topic.py
diff --git a/hsml/python/tests/test_model.py b/python/tests/test_model.py
similarity index 100%
rename from hsml/python/tests/test_model.py
rename to python/tests/test_model.py
diff --git a/hsml/python/tests/test_model_schema.py b/python/tests/test_model_schema.py
similarity index 100%
rename from hsml/python/tests/test_model_schema.py
rename to python/tests/test_model_schema.py
diff --git a/hsml/python/tests/test_predictor.py b/python/tests/test_predictor.py
similarity index 100%
rename from hsml/python/tests/test_predictor.py
rename to python/tests/test_predictor.py
diff --git a/hsml/python/tests/test_predictor_state.py b/python/tests/test_predictor_state.py
similarity index 100%
rename from hsml/python/tests/test_predictor_state.py
rename to python/tests/test_predictor_state.py
diff --git a/hsml/python/tests/test_predictor_state_condition.py b/python/tests/test_predictor_state_condition.py
similarity index 100%
rename from hsml/python/tests/test_predictor_state_condition.py
rename to python/tests/test_predictor_state_condition.py
diff --git a/hsml/python/tests/test_resources.py b/python/tests/test_resources.py
similarity index 100%
rename from hsml/python/tests/test_resources.py
rename to python/tests/test_resources.py
diff --git a/hsml/python/tests/test_schema.py b/python/tests/test_schema.py
similarity index 100%
rename from hsml/python/tests/test_schema.py
rename to python/tests/test_schema.py
diff --git a/hsml/python/tests/test_tag.py b/python/tests/test_tag.py
similarity index 100%
rename from hsml/python/tests/test_tag.py
rename to python/tests/test_tag.py
diff --git a/hsml/python/tests/test_transformer.py b/python/tests/test_transformer.py
similarity index 100%
rename from hsml/python/tests/test_transformer.py
rename to python/tests/test_transformer.py
diff --git a/hsml/python/tests/test_util.py b/python/tests/test_util.py
similarity index 100%
rename from hsml/python/tests/test_util.py
rename to python/tests/test_util.py
diff --git a/hsml/python/tests/utils/__init__.py b/python/tests/utils/__init__.py
similarity index 100%
rename from hsml/python/tests/utils/__init__.py
rename to python/tests/utils/__init__.py
diff --git a/hsml/python/tests/utils/schema/test_column.py b/python/tests/utils/schema/test_column.py
similarity index 100%
rename from hsml/python/tests/utils/schema/test_column.py
rename to python/tests/utils/schema/test_column.py
diff --git a/hsml/python/tests/utils/schema/test_columnar_schema.py b/python/tests/utils/schema/test_columnar_schema.py
similarity index 100%
rename from hsml/python/tests/utils/schema/test_columnar_schema.py
rename to python/tests/utils/schema/test_columnar_schema.py
diff --git a/hsml/python/tests/utils/schema/test_tensor.py b/python/tests/utils/schema/test_tensor.py
similarity index 100%
rename from hsml/python/tests/utils/schema/test_tensor.py
rename to python/tests/utils/schema/test_tensor.py
diff --git a/hsml/python/tests/utils/schema/test_tensor_schema.py b/python/tests/utils/schema/test_tensor_schema.py
similarity index 100%
rename from hsml/python/tests/utils/schema/test_tensor_schema.py
rename to python/tests/utils/schema/test_tensor_schema.py