diff --git a/opensearch_tests/__init__.py b/tests/opensearch_tests/__init__.py
similarity index 100%
rename from opensearch_tests/__init__.py
rename to tests/opensearch_tests/__init__.py
diff --git a/opensearch_tests/anonreviews.csv.gz b/tests/opensearch_tests/anonreviews.csv.gz
similarity index 100%
rename from opensearch_tests/anonreviews.csv.gz
rename to tests/opensearch_tests/anonreviews.csv.gz
diff --git a/opensearch_tests/common.py b/tests/opensearch_tests/common.py
similarity index 100%
rename from opensearch_tests/common.py
rename to tests/opensearch_tests/common.py
diff --git a/opensearch_tests/conftest.py b/tests/opensearch_tests/conftest.py
similarity index 100%
rename from opensearch_tests/conftest.py
rename to tests/opensearch_tests/conftest.py
diff --git a/opensearch_tests/dataframe/__init__.py b/tests/opensearch_tests/dataframe/__init__.py
similarity index 100%
rename from opensearch_tests/dataframe/__init__.py
rename to tests/opensearch_tests/dataframe/__init__.py
diff --git a/opensearch_tests/dataframe/results/.gitignore b/tests/opensearch_tests/dataframe/results/.gitignore
similarity index 100%
rename from opensearch_tests/dataframe/results/.gitignore
rename to tests/opensearch_tests/dataframe/results/.gitignore
diff --git a/opensearch_tests/dataframe/test_aggs_pytest.py b/tests/opensearch_tests/dataframe/test_aggs_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_aggs_pytest.py
rename to tests/opensearch_tests/dataframe/test_aggs_pytest.py
diff --git a/opensearch_tests/dataframe/test_big_mapping_pytest.py b/tests/opensearch_tests/dataframe/test_big_mapping_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_big_mapping_pytest.py
rename to tests/opensearch_tests/dataframe/test_big_mapping_pytest.py
diff --git a/opensearch_tests/dataframe/test_count_pytest.py b/tests/opensearch_tests/dataframe/test_count_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_count_pytest.py
rename to tests/opensearch_tests/dataframe/test_count_pytest.py
diff --git a/opensearch_tests/dataframe/test_datetime_pytest.py b/tests/opensearch_tests/dataframe/test_datetime_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_datetime_pytest.py
rename to tests/opensearch_tests/dataframe/test_datetime_pytest.py
diff --git a/opensearch_tests/dataframe/test_describe_pytest.py b/tests/opensearch_tests/dataframe/test_describe_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_describe_pytest.py
rename to tests/opensearch_tests/dataframe/test_describe_pytest.py
diff --git a/opensearch_tests/dataframe/test_dir_pytest.py b/tests/opensearch_tests/dataframe/test_dir_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_dir_pytest.py
rename to tests/opensearch_tests/dataframe/test_dir_pytest.py
diff --git a/opensearch_tests/dataframe/test_drop_pytest.py b/tests/opensearch_tests/dataframe/test_drop_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_drop_pytest.py
rename to tests/opensearch_tests/dataframe/test_drop_pytest.py
diff --git a/opensearch_tests/dataframe/test_dtypes_pytest.py b/tests/opensearch_tests/dataframe/test_dtypes_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_dtypes_pytest.py
rename to tests/opensearch_tests/dataframe/test_dtypes_pytest.py
diff --git a/opensearch_tests/dataframe/test_filter_pytest.py b/tests/opensearch_tests/dataframe/test_filter_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_filter_pytest.py
rename to tests/opensearch_tests/dataframe/test_filter_pytest.py
diff --git a/opensearch_tests/dataframe/test_get_pytest.py b/tests/opensearch_tests/dataframe/test_get_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_get_pytest.py
rename to tests/opensearch_tests/dataframe/test_get_pytest.py
diff --git a/opensearch_tests/dataframe/test_getitem_pytest.py b/tests/opensearch_tests/dataframe/test_getitem_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_getitem_pytest.py
rename to tests/opensearch_tests/dataframe/test_getitem_pytest.py
diff --git a/opensearch_tests/dataframe/test_groupby_pytest.py b/tests/opensearch_tests/dataframe/test_groupby_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_groupby_pytest.py
rename to tests/opensearch_tests/dataframe/test_groupby_pytest.py
diff --git a/opensearch_tests/dataframe/test_head_tail_pytest.py b/tests/opensearch_tests/dataframe/test_head_tail_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_head_tail_pytest.py
rename to tests/opensearch_tests/dataframe/test_head_tail_pytest.py
diff --git a/opensearch_tests/dataframe/test_hist_pytest.py b/tests/opensearch_tests/dataframe/test_hist_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_hist_pytest.py
rename to tests/opensearch_tests/dataframe/test_hist_pytest.py
diff --git a/opensearch_tests/dataframe/test_info_pytest.py b/tests/opensearch_tests/dataframe/test_info_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_info_pytest.py
rename to tests/opensearch_tests/dataframe/test_info_pytest.py
diff --git a/opensearch_tests/dataframe/test_init_pytest.py b/tests/opensearch_tests/dataframe/test_init_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_init_pytest.py
rename to tests/opensearch_tests/dataframe/test_init_pytest.py
diff --git a/opensearch_tests/dataframe/test_iterrows_itertuples_pytest.py b/tests/opensearch_tests/dataframe/test_iterrows_itertuples_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_iterrows_itertuples_pytest.py
rename to tests/opensearch_tests/dataframe/test_iterrows_itertuples_pytest.py
diff --git a/opensearch_tests/dataframe/test_keys_pytest.py b/tests/opensearch_tests/dataframe/test_keys_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_keys_pytest.py
rename to tests/opensearch_tests/dataframe/test_keys_pytest.py
diff --git a/opensearch_tests/dataframe/test_metrics_pytest.py b/tests/opensearch_tests/dataframe/test_metrics_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_metrics_pytest.py
rename to tests/opensearch_tests/dataframe/test_metrics_pytest.py
diff --git a/opensearch_tests/dataframe/test_nunique_pytest.py b/tests/opensearch_tests/dataframe/test_nunique_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_nunique_pytest.py
rename to tests/opensearch_tests/dataframe/test_nunique_pytest.py
diff --git a/opensearch_tests/dataframe/test_os_match_pytest.py b/tests/opensearch_tests/dataframe/test_os_match_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_os_match_pytest.py
rename to tests/opensearch_tests/dataframe/test_os_match_pytest.py
diff --git a/opensearch_tests/dataframe/test_os_query_pytest.py b/tests/opensearch_tests/dataframe/test_os_query_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_os_query_pytest.py
rename to tests/opensearch_tests/dataframe/test_os_query_pytest.py
diff --git a/opensearch_tests/dataframe/test_query_pytest.py b/tests/opensearch_tests/dataframe/test_query_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_query_pytest.py
rename to tests/opensearch_tests/dataframe/test_query_pytest.py
diff --git a/opensearch_tests/dataframe/test_repr_pytest.py b/tests/opensearch_tests/dataframe/test_repr_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_repr_pytest.py
rename to tests/opensearch_tests/dataframe/test_repr_pytest.py
diff --git a/opensearch_tests/dataframe/test_sample_pytest.py b/tests/opensearch_tests/dataframe/test_sample_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_sample_pytest.py
rename to tests/opensearch_tests/dataframe/test_sample_pytest.py
diff --git a/opensearch_tests/dataframe/test_select_dtypes_pytest.py b/tests/opensearch_tests/dataframe/test_select_dtypes_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_select_dtypes_pytest.py
rename to tests/opensearch_tests/dataframe/test_select_dtypes_pytest.py
diff --git a/opensearch_tests/dataframe/test_shape_pytest.py b/tests/opensearch_tests/dataframe/test_shape_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_shape_pytest.py
rename to tests/opensearch_tests/dataframe/test_shape_pytest.py
diff --git a/opensearch_tests/dataframe/test_to_csv_pytest.py b/tests/opensearch_tests/dataframe/test_to_csv_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_to_csv_pytest.py
rename to tests/opensearch_tests/dataframe/test_to_csv_pytest.py
diff --git a/opensearch_tests/dataframe/test_utils_pytest.py b/tests/opensearch_tests/dataframe/test_utils_pytest.py
similarity index 100%
rename from opensearch_tests/dataframe/test_utils_pytest.py
rename to tests/opensearch_tests/dataframe/test_utils_pytest.py
diff --git a/opensearch_tests/ecommerce.json.gz b/tests/opensearch_tests/ecommerce.json.gz
similarity index 100%
rename from opensearch_tests/ecommerce.json.gz
rename to tests/opensearch_tests/ecommerce.json.gz
diff --git a/opensearch_tests/ecommerce_df.json.gz b/tests/opensearch_tests/ecommerce_df.json.gz
similarity index 100%
rename from opensearch_tests/ecommerce_df.json.gz
rename to tests/opensearch_tests/ecommerce_df.json.gz
diff --git a/opensearch_tests/etl/__init__.py b/tests/opensearch_tests/etl/__init__.py
similarity index 100%
rename from opensearch_tests/etl/__init__.py
rename to tests/opensearch_tests/etl/__init__.py
diff --git a/opensearch_tests/etl/test_pandas_to_opensearch.py b/tests/opensearch_tests/etl/test_pandas_to_opensearch.py
similarity index 100%
rename from opensearch_tests/etl/test_pandas_to_opensearch.py
rename to tests/opensearch_tests/etl/test_pandas_to_opensearch.py
diff --git a/opensearch_tests/field_mappings/__init__.py b/tests/opensearch_tests/field_mappings/__init__.py
similarity index 100%
rename from opensearch_tests/field_mappings/__init__.py
rename to tests/opensearch_tests/field_mappings/__init__.py
diff --git a/opensearch_tests/field_mappings/test_aggregatables_pytest.py b/tests/opensearch_tests/field_mappings/test_aggregatables_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_aggregatables_pytest.py
rename to tests/opensearch_tests/field_mappings/test_aggregatables_pytest.py
diff --git a/opensearch_tests/field_mappings/test_datetime_pytest.py b/tests/opensearch_tests/field_mappings/test_datetime_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_datetime_pytest.py
rename to tests/opensearch_tests/field_mappings/test_datetime_pytest.py
diff --git a/opensearch_tests/field_mappings/test_display_names_pytest.py b/tests/opensearch_tests/field_mappings/test_display_names_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_display_names_pytest.py
rename to tests/opensearch_tests/field_mappings/test_display_names_pytest.py
diff --git a/opensearch_tests/field_mappings/test_dtypes_pytest.py b/tests/opensearch_tests/field_mappings/test_dtypes_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_dtypes_pytest.py
rename to tests/opensearch_tests/field_mappings/test_dtypes_pytest.py
diff --git a/opensearch_tests/field_mappings/test_field_name_pd_dtype_pytest.py b/tests/opensearch_tests/field_mappings/test_field_name_pd_dtype_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_field_name_pd_dtype_pytest.py
rename to tests/opensearch_tests/field_mappings/test_field_name_pd_dtype_pytest.py
diff --git a/opensearch_tests/field_mappings/test_get_field_names_pytest.py b/tests/opensearch_tests/field_mappings/test_get_field_names_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_get_field_names_pytest.py
rename to tests/opensearch_tests/field_mappings/test_get_field_names_pytest.py
diff --git a/opensearch_tests/field_mappings/test_mappings_with_type_pytest.py b/tests/opensearch_tests/field_mappings/test_mappings_with_type_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_mappings_with_type_pytest.py
rename to tests/opensearch_tests/field_mappings/test_mappings_with_type_pytest.py
diff --git a/opensearch_tests/field_mappings/test_metric_source_fields_pytest.py b/tests/opensearch_tests/field_mappings/test_metric_source_fields_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_metric_source_fields_pytest.py
rename to tests/opensearch_tests/field_mappings/test_metric_source_fields_pytest.py
diff --git a/opensearch_tests/field_mappings/test_rename_pytest.py b/tests/opensearch_tests/field_mappings/test_rename_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_rename_pytest.py
rename to tests/opensearch_tests/field_mappings/test_rename_pytest.py
diff --git a/opensearch_tests/field_mappings/test_scripted_fields_pytest.py b/tests/opensearch_tests/field_mappings/test_scripted_fields_pytest.py
similarity index 100%
rename from opensearch_tests/field_mappings/test_scripted_fields_pytest.py
rename to tests/opensearch_tests/field_mappings/test_scripted_fields_pytest.py
diff --git a/opensearch_tests/flights.json.gz b/tests/opensearch_tests/flights.json.gz
similarity index 100%
rename from opensearch_tests/flights.json.gz
rename to tests/opensearch_tests/flights.json.gz
diff --git a/opensearch_tests/flights_df.json.gz b/tests/opensearch_tests/flights_df.json.gz
similarity index 100%
rename from opensearch_tests/flights_df.json.gz
rename to tests/opensearch_tests/flights_df.json.gz
diff --git a/opensearch_tests/flights_small.json.gz b/tests/opensearch_tests/flights_small.json.gz
similarity index 100%
rename from opensearch_tests/flights_small.json.gz
rename to tests/opensearch_tests/flights_small.json.gz
diff --git a/opensearch_tests/ml_commons/__init__.py b/tests/opensearch_tests/ml_commons/__init__.py
similarity index 100%
rename from opensearch_tests/ml_commons/__init__.py
rename to tests/opensearch_tests/ml_commons/__init__.py
diff --git a/opensearch_tests/ml_commons/test_ml_commons_client.py b/tests/opensearch_tests/ml_commons/test_ml_commons_client.py
similarity index 100%
rename from opensearch_tests/ml_commons/test_ml_commons_client.py
rename to tests/opensearch_tests/ml_commons/test_ml_commons_client.py
diff --git a/opensearch_tests/ml_commons/test_model_uploader.py b/tests/opensearch_tests/ml_commons/test_model_uploader.py
similarity index 100%
rename from opensearch_tests/ml_commons/test_model_uploader.py
rename to tests/opensearch_tests/ml_commons/test_model_uploader.py
diff --git a/opensearch_tests/ml_models/__init__.py b/tests/opensearch_tests/ml_models/__init__.py
similarity index 100%
rename from opensearch_tests/ml_models/__init__.py
rename to tests/opensearch_tests/ml_models/__init__.py
diff --git a/opensearch_tests/ml_models/metrics_correlation/mcorr_data.pt b/tests/opensearch_tests/ml_models/metrics_correlation/mcorr_data.pt
similarity index 100%
rename from opensearch_tests/ml_models/metrics_correlation/mcorr_data.pt
rename to tests/opensearch_tests/ml_models/metrics_correlation/mcorr_data.pt
diff --git a/opensearch_tests/ml_models/metrics_correlation/test_mcorr.py b/tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr.py
similarity index 100%
rename from opensearch_tests/ml_models/metrics_correlation/test_mcorr.py
rename to tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr.py
diff --git a/opensearch_tests/ml_models/metrics_correlation/test_mcorr_dip_pytest.py b/tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr_dip_pytest.py
similarity index 100%
rename from opensearch_tests/ml_models/metrics_correlation/test_mcorr_dip_pytest.py
rename to tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr_dip_pytest.py
diff --git a/opensearch_tests/ml_models/metrics_correlation/test_mcorr_nmf_pytest.py b/tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr_nmf_pytest.py
similarity index 100%
rename from opensearch_tests/ml_models/metrics_correlation/test_mcorr_nmf_pytest.py
rename to tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr_nmf_pytest.py
diff --git a/opensearch_tests/ml_models/metrics_correlation/test_mcorr_pytest.py b/tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr_pytest.py
similarity index 100%
rename from opensearch_tests/ml_models/metrics_correlation/test_mcorr_pytest.py
rename to tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr_pytest.py
diff --git a/opensearch_tests/ml_models/metrics_correlation/test_mcorr_wavelet_pytest.py b/tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr_wavelet_pytest.py
similarity index 100%
rename from opensearch_tests/ml_models/metrics_correlation/test_mcorr_wavelet_pytest.py
rename to tests/opensearch_tests/ml_models/metrics_correlation/test_mcorr_wavelet_pytest.py
diff --git a/opensearch_tests/ml_models/test_sentencetransformermodel_pytest.py b/tests/opensearch_tests/ml_models/test_sentencetransformermodel_pytest.py
similarity index 100%
rename from opensearch_tests/ml_models/test_sentencetransformermodel_pytest.py
rename to tests/opensearch_tests/ml_models/test_sentencetransformermodel_pytest.py
diff --git a/opensearch_tests/model_config.json b/tests/opensearch_tests/model_config.json
similarity index 100%
rename from opensearch_tests/model_config.json
rename to tests/opensearch_tests/model_config.json
diff --git a/opensearch_tests/operations/test_map_pd_aggs_to_es_aggs_pytest.py b/tests/opensearch_tests/operations/test_map_pd_aggs_to_es_aggs_pytest.py
similarity index 100%
rename from opensearch_tests/operations/test_map_pd_aggs_to_es_aggs_pytest.py
rename to tests/opensearch_tests/operations/test_map_pd_aggs_to_es_aggs_pytest.py
diff --git a/opensearch_tests/operators/__init__.py b/tests/opensearch_tests/operators/__init__.py
similarity index 100%
rename from opensearch_tests/operators/__init__.py
rename to tests/opensearch_tests/operators/__init__.py
diff --git a/opensearch_tests/operators/test_operators_pytest.py b/tests/opensearch_tests/operators/test_operators_pytest.py
similarity index 100%
rename from opensearch_tests/operators/test_operators_pytest.py
rename to tests/opensearch_tests/operators/test_operators_pytest.py
diff --git a/opensearch_tests/plotting/test_dataframe_hist_pytest.py b/tests/opensearch_tests/plotting/test_dataframe_hist_pytest.py
similarity index 100%
rename from opensearch_tests/plotting/test_dataframe_hist_pytest.py
rename to tests/opensearch_tests/plotting/test_dataframe_hist_pytest.py
diff --git a/opensearch_tests/plotting/test_series_hist_pytest.py b/tests/opensearch_tests/plotting/test_series_hist_pytest.py
similarity index 100%
rename from opensearch_tests/plotting/test_series_hist_pytest.py
rename to tests/opensearch_tests/plotting/test_series_hist_pytest.py
diff --git a/opensearch_tests/query/test_count_pytest.py b/tests/opensearch_tests/query/test_count_pytest.py
similarity index 100%
rename from opensearch_tests/query/test_count_pytest.py
rename to tests/opensearch_tests/query/test_count_pytest.py
diff --git a/opensearch_tests/query_compiler/test_get_field_names_pytest.py b/tests/opensearch_tests/query_compiler/test_get_field_names_pytest.py
similarity index 100%
rename from opensearch_tests/query_compiler/test_get_field_names_pytest.py
rename to tests/opensearch_tests/query_compiler/test_get_field_names_pytest.py
diff --git a/opensearch_tests/query_compiler/test_os_match_pytest.py b/tests/opensearch_tests/query_compiler/test_os_match_pytest.py
similarity index 100%
rename from opensearch_tests/query_compiler/test_os_match_pytest.py
rename to tests/opensearch_tests/query_compiler/test_os_match_pytest.py
diff --git a/opensearch_tests/sample_zip.zip b/tests/opensearch_tests/sample_zip.zip
similarity index 100%
rename from opensearch_tests/sample_zip.zip
rename to tests/opensearch_tests/sample_zip.zip
diff --git a/opensearch_tests/series/__init__.py b/tests/opensearch_tests/series/__init__.py
similarity index 100%
rename from opensearch_tests/series/__init__.py
rename to tests/opensearch_tests/series/__init__.py
diff --git a/opensearch_tests/series/test_arithmetics_pytest.py b/tests/opensearch_tests/series/test_arithmetics_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_arithmetics_pytest.py
rename to tests/opensearch_tests/series/test_arithmetics_pytest.py
diff --git a/opensearch_tests/series/test_describe_pytest.py b/tests/opensearch_tests/series/test_describe_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_describe_pytest.py
rename to tests/opensearch_tests/series/test_describe_pytest.py
diff --git a/opensearch_tests/series/test_dtype_pytest.py b/tests/opensearch_tests/series/test_dtype_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_dtype_pytest.py
rename to tests/opensearch_tests/series/test_dtype_pytest.py
diff --git a/opensearch_tests/series/test_filter_pytest.py b/tests/opensearch_tests/series/test_filter_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_filter_pytest.py
rename to tests/opensearch_tests/series/test_filter_pytest.py
diff --git a/opensearch_tests/series/test_head_tail_pytest.py b/tests/opensearch_tests/series/test_head_tail_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_head_tail_pytest.py
rename to tests/opensearch_tests/series/test_head_tail_pytest.py
diff --git a/opensearch_tests/series/test_hist_pytest.py b/tests/opensearch_tests/series/test_hist_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_hist_pytest.py
rename to tests/opensearch_tests/series/test_hist_pytest.py
diff --git a/opensearch_tests/series/test_info_os_pytest.py b/tests/opensearch_tests/series/test_info_os_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_info_os_pytest.py
rename to tests/opensearch_tests/series/test_info_os_pytest.py
diff --git a/opensearch_tests/series/test_metrics_pytest.py b/tests/opensearch_tests/series/test_metrics_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_metrics_pytest.py
rename to tests/opensearch_tests/series/test_metrics_pytest.py
diff --git a/opensearch_tests/series/test_na_pytest.py b/tests/opensearch_tests/series/test_na_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_na_pytest.py
rename to tests/opensearch_tests/series/test_na_pytest.py
diff --git a/opensearch_tests/series/test_name_pytest.py b/tests/opensearch_tests/series/test_name_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_name_pytest.py
rename to tests/opensearch_tests/series/test_name_pytest.py
diff --git a/opensearch_tests/series/test_os_match.py b/tests/opensearch_tests/series/test_os_match.py
similarity index 100%
rename from opensearch_tests/series/test_os_match.py
rename to tests/opensearch_tests/series/test_os_match.py
diff --git a/opensearch_tests/series/test_rename_pytest.py b/tests/opensearch_tests/series/test_rename_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_rename_pytest.py
rename to tests/opensearch_tests/series/test_rename_pytest.py
diff --git a/opensearch_tests/series/test_repr_pytest.py b/tests/opensearch_tests/series/test_repr_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_repr_pytest.py
rename to tests/opensearch_tests/series/test_repr_pytest.py
diff --git a/opensearch_tests/series/test_sample_pytest.py b/tests/opensearch_tests/series/test_sample_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_sample_pytest.py
rename to tests/opensearch_tests/series/test_sample_pytest.py
diff --git a/opensearch_tests/series/test_str_arithmetics_pytest.py b/tests/opensearch_tests/series/test_str_arithmetics_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_str_arithmetics_pytest.py
rename to tests/opensearch_tests/series/test_str_arithmetics_pytest.py
diff --git a/opensearch_tests/series/test_value_counts_pytest.py b/tests/opensearch_tests/series/test_value_counts_pytest.py
similarity index 100%
rename from opensearch_tests/series/test_value_counts_pytest.py
rename to tests/opensearch_tests/series/test_value_counts_pytest.py
diff --git a/opensearch_tests/synthetic_queries.zip b/tests/opensearch_tests/synthetic_queries.zip
similarity index 100%
rename from opensearch_tests/synthetic_queries.zip
rename to tests/opensearch_tests/synthetic_queries.zip
diff --git a/opensearch_tests/test_common_pytest.py b/tests/opensearch_tests/test_common_pytest.py
similarity index 100%
rename from opensearch_tests/test_common_pytest.py
rename to tests/opensearch_tests/test_common_pytest.py
diff --git a/opensearch_tests/test_utils_pytest.py b/tests/opensearch_tests/test_utils_pytest.py
similarity index 100%
rename from opensearch_tests/test_utils_pytest.py
rename to tests/opensearch_tests/test_utils_pytest.py