diff --git a/hsfs/python/tests/__init__.py b/hsfs/python/tests/__init__.py
deleted file mode 100644
index 11e65f162..000000000
--- a/hsfs/python/tests/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#   Copyright 2020 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/hsfs/python/tests/client/test_base_client.py b/python/tests/client/test_base_client.py
similarity index 100%
rename from hsfs/python/tests/client/test_base_client.py
rename to python/tests/client/test_base_client.py
diff --git a/hsfs/python/tests/constructor/test_external_feature_group_alias.py b/python/tests/constructor/test_external_feature_group_alias.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_external_feature_group_alias.py
rename to python/tests/constructor/test_external_feature_group_alias.py
diff --git a/hsfs/python/tests/constructor/test_filter.py b/python/tests/constructor/test_filter.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_filter.py
rename to python/tests/constructor/test_filter.py
diff --git a/hsfs/python/tests/constructor/test_fs_query.py b/python/tests/constructor/test_fs_query.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_fs_query.py
rename to python/tests/constructor/test_fs_query.py
diff --git a/hsfs/python/tests/constructor/test_hudi_feature_group_alias.py b/python/tests/constructor/test_hudi_feature_group_alias.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_hudi_feature_group_alias.py
rename to python/tests/constructor/test_hudi_feature_group_alias.py
diff --git a/hsfs/python/tests/constructor/test_join.py b/python/tests/constructor/test_join.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_join.py
rename to python/tests/constructor/test_join.py
diff --git a/hsfs/python/tests/constructor/test_prepared_statement_parameter.py b/python/tests/constructor/test_prepared_statement_parameter.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_prepared_statement_parameter.py
rename to python/tests/constructor/test_prepared_statement_parameter.py
diff --git a/hsfs/python/tests/constructor/test_query.py b/python/tests/constructor/test_query.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_query.py
rename to python/tests/constructor/test_query.py
diff --git a/hsfs/python/tests/constructor/test_serving_prepared_statement.py b/python/tests/constructor/test_serving_prepared_statement.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_serving_prepared_statement.py
rename to python/tests/constructor/test_serving_prepared_statement.py
diff --git a/hsfs/python/tests/core/__init__.py b/python/tests/core/__init__.py
similarity index 100%
rename from hsfs/python/tests/core/__init__.py
rename to python/tests/core/__init__.py
diff --git a/hsfs/python/tests/core/test_arrow_flight_client.py b/python/tests/core/test_arrow_flight_client.py
similarity index 100%
rename from hsfs/python/tests/core/test_arrow_flight_client.py
rename to python/tests/core/test_arrow_flight_client.py
diff --git a/hsfs/python/tests/core/test_code_engine.py b/python/tests/core/test_code_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_code_engine.py
rename to python/tests/core/test_code_engine.py
diff --git a/hsfs/python/tests/core/test_execution.py b/python/tests/core/test_execution.py
similarity index 100%
rename from hsfs/python/tests/core/test_execution.py
rename to python/tests/core/test_execution.py
diff --git a/hsfs/python/tests/core/test_expectation_engine.py b/python/tests/core/test_expectation_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_expectation_engine.py
rename to python/tests/core/test_expectation_engine.py
diff --git a/hsfs/python/tests/core/test_expectation_suite_engine.py b/python/tests/core/test_expectation_suite_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_expectation_suite_engine.py
rename to python/tests/core/test_expectation_suite_engine.py
diff --git a/hsfs/python/tests/core/test_external_feature_group_engine.py b/python/tests/core/test_external_feature_group_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_external_feature_group_engine.py
rename to python/tests/core/test_external_feature_group_engine.py
diff --git a/hsfs/python/tests/core/test_feature_descriptive_statistics.py b/python/tests/core/test_feature_descriptive_statistics.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_descriptive_statistics.py
rename to python/tests/core/test_feature_descriptive_statistics.py
diff --git a/hsfs/python/tests/core/test_feature_group_api.py b/python/tests/core/test_feature_group_api.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_group_api.py
rename to python/tests/core/test_feature_group_api.py
diff --git a/hsfs/python/tests/core/test_feature_group_base_engine.py b/python/tests/core/test_feature_group_base_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_group_base_engine.py
rename to python/tests/core/test_feature_group_base_engine.py
diff --git a/hsfs/python/tests/core/test_feature_group_engine.py b/python/tests/core/test_feature_group_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_group_engine.py
rename to python/tests/core/test_feature_group_engine.py
diff --git a/hsfs/python/tests/core/test_feature_monitoring_config.py b/python/tests/core/test_feature_monitoring_config.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_monitoring_config.py
rename to python/tests/core/test_feature_monitoring_config.py
diff --git a/hsfs/python/tests/core/test_feature_monitoring_config_engine.py b/python/tests/core/test_feature_monitoring_config_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_monitoring_config_engine.py
rename to python/tests/core/test_feature_monitoring_config_engine.py
diff --git a/hsfs/python/tests/core/test_feature_monitoring_result.py b/python/tests/core/test_feature_monitoring_result.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_monitoring_result.py
rename to python/tests/core/test_feature_monitoring_result.py
diff --git a/hsfs/python/tests/core/test_feature_monitoring_result_engine.py b/python/tests/core/test_feature_monitoring_result_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_monitoring_result_engine.py
rename to python/tests/core/test_feature_monitoring_result_engine.py
diff --git a/hsfs/python/tests/core/test_feature_view_engine.py b/python/tests/core/test_feature_view_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_view_engine.py
rename to python/tests/core/test_feature_view_engine.py
diff --git a/hsfs/python/tests/core/test_great_expectation_engine.py b/python/tests/core/test_great_expectation_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_great_expectation_engine.py
rename to python/tests/core/test_great_expectation_engine.py
diff --git a/hsfs/python/tests/core/test_hudi_engine.py b/python/tests/core/test_hudi_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_hudi_engine.py
rename to python/tests/core/test_hudi_engine.py
diff --git a/hsfs/python/tests/core/test_ingestion_job.py b/python/tests/core/test_ingestion_job.py
similarity index 100%
rename from hsfs/python/tests/core/test_ingestion_job.py
rename to python/tests/core/test_ingestion_job.py
diff --git a/hsfs/python/tests/core/test_inode.py b/python/tests/core/test_inode.py
similarity index 100%
rename from hsfs/python/tests/core/test_inode.py
rename to python/tests/core/test_inode.py
diff --git a/hsfs/python/tests/core/test_job.py b/python/tests/core/test_job.py
similarity index 100%
rename from hsfs/python/tests/core/test_job.py
rename to python/tests/core/test_job.py
diff --git a/hsfs/python/tests/core/test_job_configuration.py b/python/tests/core/test_job_configuration.py
similarity index 100%
rename from hsfs/python/tests/core/test_job_configuration.py
rename to python/tests/core/test_job_configuration.py
diff --git a/hsfs/python/tests/core/test_monitoring_window_config.py b/python/tests/core/test_monitoring_window_config.py
similarity index 100%
rename from hsfs/python/tests/core/test_monitoring_window_config.py
rename to python/tests/core/test_monitoring_window_config.py
diff --git a/hsfs/python/tests/core/test_monitoring_window_config_engine.py b/python/tests/core/test_monitoring_window_config_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_monitoring_window_config_engine.py
rename to python/tests/core/test_monitoring_window_config_engine.py
diff --git a/hsfs/python/tests/core/test_online_store_rest_client.py b/python/tests/core/test_online_store_rest_client.py
similarity index 100%
rename from hsfs/python/tests/core/test_online_store_rest_client.py
rename to python/tests/core/test_online_store_rest_client.py
diff --git a/hsfs/python/tests/core/test_online_store_rest_client_api.py b/python/tests/core/test_online_store_rest_client_api.py
similarity index 100%
rename from hsfs/python/tests/core/test_online_store_rest_client_api.py
rename to python/tests/core/test_online_store_rest_client_api.py
diff --git a/hsfs/python/tests/core/test_online_store_rest_client_engine.py b/python/tests/core/test_online_store_rest_client_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_online_store_rest_client_engine.py
rename to python/tests/core/test_online_store_rest_client_engine.py
diff --git a/hsfs/python/tests/core/test_opensearch.py b/python/tests/core/test_opensearch.py
similarity index 100%
rename from hsfs/python/tests/core/test_opensearch.py
rename to python/tests/core/test_opensearch.py
diff --git a/hsfs/python/tests/core/test_statistics_engine.py b/python/tests/core/test_statistics_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_statistics_engine.py
rename to python/tests/core/test_statistics_engine.py
diff --git a/hsfs/python/tests/core/test_training_dataset_engine.py b/python/tests/core/test_training_dataset_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_training_dataset_engine.py
rename to python/tests/core/test_training_dataset_engine.py
diff --git a/hsfs/python/tests/core/test_transformation_function_engine.py b/python/tests/core/test_transformation_function_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_transformation_function_engine.py
rename to python/tests/core/test_transformation_function_engine.py
diff --git a/hsfs/python/tests/core/test_validation_report_engine.py b/python/tests/core/test_validation_report_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_validation_report_engine.py
rename to python/tests/core/test_validation_report_engine.py
diff --git a/hsfs/python/tests/core/test_validation_result_engine.py b/python/tests/core/test_validation_result_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_validation_result_engine.py
rename to python/tests/core/test_validation_result_engine.py
diff --git a/hsfs/python/tests/core/test_vector_db_client.py b/python/tests/core/test_vector_db_client.py
similarity index 100%
rename from hsfs/python/tests/core/test_vector_db_client.py
rename to python/tests/core/test_vector_db_client.py
diff --git a/hsfs/python/tests/data/hadoop/bin/winutils.exe b/python/tests/data/hadoop/bin/winutils.exe
similarity index 100%
rename from hsfs/python/tests/data/hadoop/bin/winutils.exe
rename to python/tests/data/hadoop/bin/winutils.exe
diff --git a/hsfs/python/tests/data/test_basic.csv b/python/tests/data/test_basic.csv
similarity index 100%
rename from hsfs/python/tests/data/test_basic.csv
rename to python/tests/data/test_basic.csv
diff --git a/hsfs/python/tests/data/test_basic.parquet b/python/tests/data/test_basic.parquet
similarity index 100%
rename from hsfs/python/tests/data/test_basic.parquet
rename to python/tests/data/test_basic.parquet
diff --git a/hsfs/python/tests/data/test_basic.tsv b/python/tests/data/test_basic.tsv
similarity index 100%
rename from hsfs/python/tests/data/test_basic.tsv
rename to python/tests/data/test_basic.tsv
diff --git a/hsfs/python/tests/engine/__init__.py b/python/tests/engine/__init__.py
similarity index 100%
rename from hsfs/python/tests/engine/__init__.py
rename to python/tests/engine/__init__.py
diff --git a/hsfs/python/tests/engine/test_python.py b/python/tests/engine/test_python.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python.py
rename to python/tests/engine/test_python.py
diff --git a/hsfs/python/tests/engine/test_python_reader.py b/python/tests/engine/test_python_reader.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python_reader.py
rename to python/tests/engine/test_python_reader.py
diff --git a/hsfs/python/tests/engine/test_python_spark_convert_dataframe.py b/python/tests/engine/test_python_spark_convert_dataframe.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python_spark_convert_dataframe.py
rename to python/tests/engine/test_python_spark_convert_dataframe.py
diff --git a/hsfs/python/tests/engine/test_python_spark_transformation_functions.py b/python/tests/engine/test_python_spark_transformation_functions.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python_spark_transformation_functions.py
rename to python/tests/engine/test_python_spark_transformation_functions.py
diff --git a/hsfs/python/tests/engine/test_python_writer.py b/python/tests/engine/test_python_writer.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python_writer.py
rename to python/tests/engine/test_python_writer.py
diff --git a/hsfs/python/tests/engine/test_spark.py b/python/tests/engine/test_spark.py
similarity index 100%
rename from hsfs/python/tests/engine/test_spark.py
rename to python/tests/engine/test_spark.py
diff --git a/hsfs/python/tests/pyproject.toml b/python/tests/pyproject.toml
similarity index 100%
rename from hsfs/python/tests/pyproject.toml
rename to python/tests/pyproject.toml
diff --git a/hsfs/python/tests/test_expectation_suite.py b/python/tests/test_expectation_suite.py
similarity index 100%
rename from hsfs/python/tests/test_expectation_suite.py
rename to python/tests/test_expectation_suite.py
diff --git a/hsfs/python/tests/test_feature.py b/python/tests/test_feature.py
similarity index 100%
rename from hsfs/python/tests/test_feature.py
rename to python/tests/test_feature.py
diff --git a/hsfs/python/tests/test_feature_group.py b/python/tests/test_feature_group.py
similarity index 100%
rename from hsfs/python/tests/test_feature_group.py
rename to python/tests/test_feature_group.py
diff --git a/hsfs/python/tests/test_feature_group_commit.py b/python/tests/test_feature_group_commit.py
similarity index 100%
rename from hsfs/python/tests/test_feature_group_commit.py
rename to python/tests/test_feature_group_commit.py
diff --git a/hsfs/python/tests/test_feature_group_writer.py b/python/tests/test_feature_group_writer.py
similarity index 100%
rename from hsfs/python/tests/test_feature_group_writer.py
rename to python/tests/test_feature_group_writer.py
diff --git a/hsfs/python/tests/test_feature_store.py b/python/tests/test_feature_store.py
similarity index 100%
rename from hsfs/python/tests/test_feature_store.py
rename to python/tests/test_feature_store.py
diff --git a/hsfs/python/tests/test_feature_view.py b/python/tests/test_feature_view.py
similarity index 100%
rename from hsfs/python/tests/test_feature_view.py
rename to python/tests/test_feature_view.py
diff --git a/hsfs/python/tests/test_ge_expectation.py b/python/tests/test_ge_expectation.py
similarity index 100%
rename from hsfs/python/tests/test_ge_expectation.py
rename to python/tests/test_ge_expectation.py
diff --git a/hsfs/python/tests/test_ge_validation_result.py b/python/tests/test_ge_validation_result.py
similarity index 100%
rename from hsfs/python/tests/test_ge_validation_result.py
rename to python/tests/test_ge_validation_result.py
diff --git a/hsfs/python/tests/test_serving_keys.py b/python/tests/test_serving_keys.py
similarity index 100%
rename from hsfs/python/tests/test_serving_keys.py
rename to python/tests/test_serving_keys.py
diff --git a/hsfs/python/tests/test_split_statistics.py b/python/tests/test_split_statistics.py
similarity index 100%
rename from hsfs/python/tests/test_split_statistics.py
rename to python/tests/test_split_statistics.py
diff --git a/hsfs/python/tests/test_statistics.py b/python/tests/test_statistics.py
similarity index 100%
rename from hsfs/python/tests/test_statistics.py
rename to python/tests/test_statistics.py
diff --git a/hsfs/python/tests/test_statistics_config.py b/python/tests/test_statistics_config.py
similarity index 100%
rename from hsfs/python/tests/test_statistics_config.py
rename to python/tests/test_statistics_config.py
diff --git a/hsfs/python/tests/test_storage_connector.py b/python/tests/test_storage_connector.py
similarity index 100%
rename from hsfs/python/tests/test_storage_connector.py
rename to python/tests/test_storage_connector.py
diff --git a/hsfs/python/tests/test_training_dataset.py b/python/tests/test_training_dataset.py
similarity index 100%
rename from hsfs/python/tests/test_training_dataset.py
rename to python/tests/test_training_dataset.py
diff --git a/hsfs/python/tests/test_training_dataset_feature.py b/python/tests/test_training_dataset_feature.py
similarity index 100%
rename from hsfs/python/tests/test_training_dataset_feature.py
rename to python/tests/test_training_dataset_feature.py
diff --git a/hsfs/python/tests/test_training_dataset_split.py b/python/tests/test_training_dataset_split.py
similarity index 100%
rename from hsfs/python/tests/test_training_dataset_split.py
rename to python/tests/test_training_dataset_split.py
diff --git a/hsfs/python/tests/test_transformation_function.py b/python/tests/test_transformation_function.py
similarity index 100%
rename from hsfs/python/tests/test_transformation_function.py
rename to python/tests/test_transformation_function.py
diff --git a/hsfs/python/tests/test_transformation_function_attached.py b/python/tests/test_transformation_function_attached.py
similarity index 100%
rename from hsfs/python/tests/test_transformation_function_attached.py
rename to python/tests/test_transformation_function_attached.py
diff --git a/hsfs/python/tests/test_user.py b/python/tests/test_user.py
similarity index 100%
rename from hsfs/python/tests/test_user.py
rename to python/tests/test_user.py
diff --git a/hsfs/python/tests/test_validation_report.py b/python/tests/test_validation_report.py
similarity index 100%
rename from hsfs/python/tests/test_validation_report.py
rename to python/tests/test_validation_report.py