diff --git a/test/conftest.py b/test/conftest.py
index 41c7c33bce..9f0fcbc7c8 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -76,6 +76,8 @@ def pytest_collection_modifyitems(items) -> None:
         item_path = Path(str(item.fspath)).parent
         relative_path = item_path.relative_to(top_test_dir)
         for part in relative_path.parts:
+            if part.endswith("_it"):
+                part = part[:-3]
             item.add_marker(part)
             if part in ("unit", "pandas"):
                 item.add_marker("skipolddriver")
diff --git a/test/integ/aio/__init__.py b/test/integ/aio_it/__init__.py
similarity index 100%
rename from test/integ/aio/__init__.py
rename to test/integ/aio_it/__init__.py
diff --git a/test/integ/aio/conftest.py b/test/integ/aio_it/conftest.py
similarity index 100%
rename from test/integ/aio/conftest.py
rename to test/integ/aio_it/conftest.py
diff --git a/test/integ/aio/lambda/__init__.py b/test/integ/aio_it/lambda_it/__init__.py
similarity index 100%
rename from test/integ/aio/lambda/__init__.py
rename to test/integ/aio_it/lambda_it/__init__.py
diff --git a/test/integ/aio/lambda/test_basic_query_async.py b/test/integ/aio_it/lambda_it/test_basic_query_async.py
similarity index 100%
rename from test/integ/aio/lambda/test_basic_query_async.py
rename to test/integ/aio_it/lambda_it/test_basic_query_async.py
diff --git a/test/integ/aio/pandas/__init__.py b/test/integ/aio_it/pandas_it/__init__.py
similarity index 100%
rename from test/integ/aio/pandas/__init__.py
rename to test/integ/aio_it/pandas_it/__init__.py
diff --git a/test/integ/aio/pandas/test_arrow_chunk_iterator_async.py b/test/integ/aio_it/pandas_it/test_arrow_chunk_iterator_async.py
similarity index 100%
rename from test/integ/aio/pandas/test_arrow_chunk_iterator_async.py
rename to test/integ/aio_it/pandas_it/test_arrow_chunk_iterator_async.py
diff --git a/test/integ/aio/pandas/test_arrow_pandas_async.py b/test/integ/aio_it/pandas_it/test_arrow_pandas_async.py
similarity index 100%
rename from test/integ/aio/pandas/test_arrow_pandas_async.py
rename to test/integ/aio_it/pandas_it/test_arrow_pandas_async.py
diff --git a/test/integ/aio/pandas/test_logging_async.py b/test/integ/aio_it/pandas_it/test_logging_async.py
similarity index 100%
rename from test/integ/aio/pandas/test_logging_async.py
rename to test/integ/aio_it/pandas_it/test_logging_async.py
diff --git a/test/integ/aio/sso/__init__.py b/test/integ/aio_it/sso_it/__init__.py
similarity index 100%
rename from test/integ/aio/sso/__init__.py
rename to test/integ/aio_it/sso_it/__init__.py
diff --git a/test/integ/aio/sso/test_connection_manual_async.py b/test/integ/aio_it/sso_it/test_connection_manual_async.py
similarity index 100%
rename from test/integ/aio/sso/test_connection_manual_async.py
rename to test/integ/aio_it/sso_it/test_connection_manual_async.py
diff --git a/test/integ/aio/sso/test_unit_mfa_cache_async.py b/test/integ/aio_it/sso_it/test_unit_mfa_cache_async.py
similarity index 100%
rename from test/integ/aio/sso/test_unit_mfa_cache_async.py
rename to test/integ/aio_it/sso_it/test_unit_mfa_cache_async.py
diff --git a/test/integ/aio/test_arrow_result_async.py b/test/integ/aio_it/test_arrow_result_async.py
similarity index 100%
rename from test/integ/aio/test_arrow_result_async.py
rename to test/integ/aio_it/test_arrow_result_async.py
diff --git a/test/integ/aio/test_async_async.py b/test/integ/aio_it/test_async_async.py
similarity index 100%
rename from test/integ/aio/test_async_async.py
rename to test/integ/aio_it/test_async_async.py
diff --git a/test/integ/aio/test_autocommit_async.py b/test/integ/aio_it/test_autocommit_async.py
similarity index 100%
rename from test/integ/aio/test_autocommit_async.py
rename to test/integ/aio_it/test_autocommit_async.py
diff --git a/test/integ/aio/test_bindings_async.py b/test/integ/aio_it/test_bindings_async.py
similarity index 100%
rename from test/integ/aio/test_bindings_async.py
rename to test/integ/aio_it/test_bindings_async.py
diff --git a/test/integ/aio/test_boolean_async.py b/test/integ/aio_it/test_boolean_async.py
similarity index 100%
rename from test/integ/aio/test_boolean_async.py
rename to test/integ/aio_it/test_boolean_async.py
diff --git a/test/integ/aio/test_client_session_keep_alive_async.py b/test/integ/aio_it/test_client_session_keep_alive_async.py
similarity index 100%
rename from test/integ/aio/test_client_session_keep_alive_async.py
rename to test/integ/aio_it/test_client_session_keep_alive_async.py
diff --git a/test/integ/aio/test_concurrent_create_objects_async.py b/test/integ/aio_it/test_concurrent_create_objects_async.py
similarity index 100%
rename from test/integ/aio/test_concurrent_create_objects_async.py
rename to test/integ/aio_it/test_concurrent_create_objects_async.py
diff --git a/test/integ/aio/test_concurrent_insert_async.py b/test/integ/aio_it/test_concurrent_insert_async.py
similarity index 100%
rename from test/integ/aio/test_concurrent_insert_async.py
rename to test/integ/aio_it/test_concurrent_insert_async.py
diff --git a/test/integ/aio/test_connection_async.py b/test/integ/aio_it/test_connection_async.py
similarity index 99%
rename from test/integ/aio/test_connection_async.py
rename to test/integ/aio_it/test_connection_async.py
index e0c771664a..df76fa1df4 100644
--- a/test/integ/aio/test_connection_async.py
+++ b/test/integ/aio_it/test_connection_async.py
@@ -1674,7 +1674,7 @@ async def test_is_valid(conn_cnx):
 async def test_no_auth_connection_negative_case():
     # AuthNoAuth does not exist in old drivers, so we import at test level to
     # skip importing it for old driver tests.
-    from test.integ.aio.conftest import create_connection
+    from test.integ.aio_it.conftest import create_connection
 
     from snowflake.connector.aio.auth._no_auth import AuthNoAuth
 
diff --git a/test/integ/aio/test_converter_async.py b/test/integ/aio_it/test_converter_async.py
similarity index 100%
rename from test/integ/aio/test_converter_async.py
rename to test/integ/aio_it/test_converter_async.py
diff --git a/test/integ/aio/test_converter_more_timestamp_async.py b/test/integ/aio_it/test_converter_more_timestamp_async.py
similarity index 100%
rename from test/integ/aio/test_converter_more_timestamp_async.py
rename to test/integ/aio_it/test_converter_more_timestamp_async.py
diff --git a/test/integ/aio/test_converter_null_async.py b/test/integ/aio_it/test_converter_null_async.py
similarity index 100%
rename from test/integ/aio/test_converter_null_async.py
rename to test/integ/aio_it/test_converter_null_async.py
diff --git a/test/integ/aio/test_cursor_async.py b/test/integ/aio_it/test_cursor_async.py
similarity index 100%
rename from test/integ/aio/test_cursor_async.py
rename to test/integ/aio_it/test_cursor_async.py
diff --git a/test/integ/aio/test_cursor_binding_async.py b/test/integ/aio_it/test_cursor_binding_async.py
similarity index 100%
rename from test/integ/aio/test_cursor_binding_async.py
rename to test/integ/aio_it/test_cursor_binding_async.py
diff --git a/test/integ/aio/test_cursor_context_manager_async.py b/test/integ/aio_it/test_cursor_context_manager_async.py
similarity index 100%
rename from test/integ/aio/test_cursor_context_manager_async.py
rename to test/integ/aio_it/test_cursor_context_manager_async.py
diff --git a/test/integ/aio/test_dataintegrity_async.py b/test/integ/aio_it/test_dataintegrity_async.py
similarity index 100%
rename from test/integ/aio/test_dataintegrity_async.py
rename to test/integ/aio_it/test_dataintegrity_async.py
diff --git a/test/integ/aio/test_daylight_savings_async.py b/test/integ/aio_it/test_daylight_savings_async.py
similarity index 100%
rename from test/integ/aio/test_daylight_savings_async.py
rename to test/integ/aio_it/test_daylight_savings_async.py
diff --git a/test/integ/aio/test_dbapi_async.py b/test/integ/aio_it/test_dbapi_async.py
similarity index 100%
rename from test/integ/aio/test_dbapi_async.py
rename to test/integ/aio_it/test_dbapi_async.py
diff --git a/test/integ/aio/test_decfloat_async.py b/test/integ/aio_it/test_decfloat_async.py
similarity index 100%
rename from test/integ/aio/test_decfloat_async.py
rename to test/integ/aio_it/test_decfloat_async.py
diff --git a/test/integ/aio/test_direct_file_operation_utils_async.py b/test/integ/aio_it/test_direct_file_operation_utils_async.py
similarity index 100%
rename from test/integ/aio/test_direct_file_operation_utils_async.py
rename to test/integ/aio_it/test_direct_file_operation_utils_async.py
diff --git a/test/integ/aio/test_errors_async.py b/test/integ/aio_it/test_errors_async.py
similarity index 100%
rename from test/integ/aio/test_errors_async.py
rename to test/integ/aio_it/test_errors_async.py
diff --git a/test/integ/aio/test_execute_multi_statements_async.py b/test/integ/aio_it/test_execute_multi_statements_async.py
similarity index 100%
rename from test/integ/aio/test_execute_multi_statements_async.py
rename to test/integ/aio_it/test_execute_multi_statements_async.py
diff --git a/test/integ/aio/test_key_pair_authentication_async.py b/test/integ/aio_it/test_key_pair_authentication_async.py
similarity index 100%
rename from test/integ/aio/test_key_pair_authentication_async.py
rename to test/integ/aio_it/test_key_pair_authentication_async.py
diff --git a/test/integ/aio/test_large_put_async.py b/test/integ/aio_it/test_large_put_async.py
similarity index 100%
rename from test/integ/aio/test_large_put_async.py
rename to test/integ/aio_it/test_large_put_async.py
diff --git a/test/integ/aio/test_large_result_set_async.py b/test/integ/aio_it/test_large_result_set_async.py
similarity index 100%
rename from test/integ/aio/test_large_result_set_async.py
rename to test/integ/aio_it/test_large_result_set_async.py
diff --git a/test/integ/aio/test_load_unload_async.py b/test/integ/aio_it/test_load_unload_async.py
similarity index 100%
rename from test/integ/aio/test_load_unload_async.py
rename to test/integ/aio_it/test_load_unload_async.py
diff --git a/test/integ/aio/test_multi_statement_async.py b/test/integ/aio_it/test_multi_statement_async.py
similarity index 100%
rename from test/integ/aio/test_multi_statement_async.py
rename to test/integ/aio_it/test_multi_statement_async.py
diff --git a/test/integ/aio/test_network_async.py b/test/integ/aio_it/test_network_async.py
similarity index 100%
rename from test/integ/aio/test_network_async.py
rename to test/integ/aio_it/test_network_async.py
diff --git a/test/integ/aio/test_numpy_binding_async.py b/test/integ/aio_it/test_numpy_binding_async.py
similarity index 100%
rename from test/integ/aio/test_numpy_binding_async.py
rename to test/integ/aio_it/test_numpy_binding_async.py
diff --git a/test/integ/aio/test_pickle_timestamp_tz_async.py b/test/integ/aio_it/test_pickle_timestamp_tz_async.py
similarity index 100%
rename from test/integ/aio/test_pickle_timestamp_tz_async.py
rename to test/integ/aio_it/test_pickle_timestamp_tz_async.py
diff --git a/test/integ/aio/test_put_get_async.py b/test/integ/aio_it/test_put_get_async.py
similarity index 100%
rename from test/integ/aio/test_put_get_async.py
rename to test/integ/aio_it/test_put_get_async.py
diff --git a/test/integ/aio/test_put_get_compress_enc_async.py b/test/integ/aio_it/test_put_get_compress_enc_async.py
similarity index 100%
rename from test/integ/aio/test_put_get_compress_enc_async.py
rename to test/integ/aio_it/test_put_get_compress_enc_async.py
diff --git a/test/integ/aio/test_put_get_medium_async.py b/test/integ/aio_it/test_put_get_medium_async.py
similarity index 100%
rename from test/integ/aio/test_put_get_medium_async.py
rename to test/integ/aio_it/test_put_get_medium_async.py
diff --git a/test/integ/aio/test_put_get_snow_4525_async.py b/test/integ/aio_it/test_put_get_snow_4525_async.py
similarity index 100%
rename from test/integ/aio/test_put_get_snow_4525_async.py
rename to test/integ/aio_it/test_put_get_snow_4525_async.py
diff --git a/test/integ/aio/test_put_get_user_stage_async.py b/test/integ/aio_it/test_put_get_user_stage_async.py
similarity index 100%
rename from test/integ/aio/test_put_get_user_stage_async.py
rename to test/integ/aio_it/test_put_get_user_stage_async.py
diff --git a/test/integ/aio/test_put_get_with_aws_token_async.py b/test/integ/aio_it/test_put_get_with_aws_token_async.py
similarity index 100%
rename from test/integ/aio/test_put_get_with_aws_token_async.py
rename to test/integ/aio_it/test_put_get_with_aws_token_async.py
diff --git a/test/integ/aio/test_put_get_with_azure_token_async.py b/test/integ/aio_it/test_put_get_with_azure_token_async.py
similarity index 100%
rename from test/integ/aio/test_put_get_with_azure_token_async.py
rename to test/integ/aio_it/test_put_get_with_azure_token_async.py
diff --git a/test/integ/aio/test_put_get_with_gcp_account_async.py b/test/integ/aio_it/test_put_get_with_gcp_account_async.py
similarity index 100%
rename from test/integ/aio/test_put_get_with_gcp_account_async.py
rename to test/integ/aio_it/test_put_get_with_gcp_account_async.py
diff --git a/test/integ/aio/test_put_windows_path_async.py b/test/integ/aio_it/test_put_windows_path_async.py
similarity index 100%
rename from test/integ/aio/test_put_windows_path_async.py
rename to test/integ/aio_it/test_put_windows_path_async.py
diff --git a/test/integ/aio/test_qmark_async.py b/test/integ/aio_it/test_qmark_async.py
similarity index 100%
rename from test/integ/aio/test_qmark_async.py
rename to test/integ/aio_it/test_qmark_async.py
diff --git a/test/integ/aio/test_query_cancelling_async.py b/test/integ/aio_it/test_query_cancelling_async.py
similarity index 100%
rename from test/integ/aio/test_query_cancelling_async.py
rename to test/integ/aio_it/test_query_cancelling_async.py
diff --git a/test/integ/aio/test_results_async.py b/test/integ/aio_it/test_results_async.py
similarity index 100%
rename from test/integ/aio/test_results_async.py
rename to test/integ/aio_it/test_results_async.py
diff --git a/test/integ/aio/test_reuse_cursor_async.py b/test/integ/aio_it/test_reuse_cursor_async.py
similarity index 100%
rename from test/integ/aio/test_reuse_cursor_async.py
rename to test/integ/aio_it/test_reuse_cursor_async.py
diff --git a/test/integ/aio/test_session_parameters_async.py b/test/integ/aio_it/test_session_parameters_async.py
similarity index 100%
rename from test/integ/aio/test_session_parameters_async.py
rename to test/integ/aio_it/test_session_parameters_async.py
diff --git a/test/integ/aio/test_statement_parameter_binding_async.py b/test/integ/aio_it/test_statement_parameter_binding_async.py
similarity index 100%
rename from test/integ/aio/test_statement_parameter_binding_async.py
rename to test/integ/aio_it/test_statement_parameter_binding_async.py
diff --git a/test/integ/aio/test_structured_types_async.py b/test/integ/aio_it/test_structured_types_async.py
similarity index 100%
rename from test/integ/aio/test_structured_types_async.py
rename to test/integ/aio_it/test_structured_types_async.py
diff --git a/test/integ/aio/test_transaction_async.py b/test/integ/aio_it/test_transaction_async.py
similarity index 100%
rename from test/integ/aio/test_transaction_async.py
rename to test/integ/aio_it/test_transaction_async.py
diff --git a/test/integ/lambda/__init__.py b/test/integ/lambda_it/__init__.py
similarity index 100%
rename from test/integ/lambda/__init__.py
rename to test/integ/lambda_it/__init__.py
diff --git a/test/integ/lambda/test_basic_query.py b/test/integ/lambda_it/test_basic_query.py
similarity index 100%
rename from test/integ/lambda/test_basic_query.py
rename to test/integ/lambda_it/test_basic_query.py
diff --git a/test/integ/pandas/__init__.py b/test/integ/pandas_it/__init__.py
similarity index 100%
rename from test/integ/pandas/__init__.py
rename to test/integ/pandas_it/__init__.py
diff --git a/test/integ/pandas/test_arrow_chunk_iterator.py b/test/integ/pandas_it/test_arrow_chunk_iterator.py
similarity index 100%
rename from test/integ/pandas/test_arrow_chunk_iterator.py
rename to test/integ/pandas_it/test_arrow_chunk_iterator.py
diff --git a/test/integ/pandas/test_arrow_pandas.py b/test/integ/pandas_it/test_arrow_pandas.py
similarity index 100%
rename from test/integ/pandas/test_arrow_pandas.py
rename to test/integ/pandas_it/test_arrow_pandas.py
diff --git a/test/integ/pandas/test_error_arrow_pandas_stream.py b/test/integ/pandas_it/test_error_arrow_pandas_stream.py
similarity index 100%
rename from test/integ/pandas/test_error_arrow_pandas_stream.py
rename to test/integ/pandas_it/test_error_arrow_pandas_stream.py
diff --git a/test/integ/pandas/test_logging.py b/test/integ/pandas_it/test_logging.py
similarity index 100%
rename from test/integ/pandas/test_logging.py
rename to test/integ/pandas_it/test_logging.py
diff --git a/test/integ/pandas/test_pandas_tools.py b/test/integ/pandas_it/test_pandas_tools.py
similarity index 100%
rename from test/integ/pandas/test_pandas_tools.py
rename to test/integ/pandas_it/test_pandas_tools.py
diff --git a/test/integ/pandas/test_unit_arrow_chunk_iterator.py b/test/integ/pandas_it/test_unit_arrow_chunk_iterator.py
similarity index 100%
rename from test/integ/pandas/test_unit_arrow_chunk_iterator.py
rename to test/integ/pandas_it/test_unit_arrow_chunk_iterator.py
diff --git a/test/integ/pandas/test_unit_options.py b/test/integ/pandas_it/test_unit_options.py
similarity index 100%
rename from test/integ/pandas/test_unit_options.py
rename to test/integ/pandas_it/test_unit_options.py
diff --git a/test/integ/sso/__init__.py b/test/integ/sso_it/__init__.py
similarity index 100%
rename from test/integ/sso/__init__.py
rename to test/integ/sso_it/__init__.py
diff --git a/test/integ/sso/test_connection_manual.py b/test/integ/sso_it/test_connection_manual.py
similarity index 100%
rename from test/integ/sso/test_connection_manual.py
rename to test/integ/sso_it/test_connection_manual.py
diff --git a/test/integ/sso/test_unit_mfa_cache.py b/test/integ/sso_it/test_unit_mfa_cache.py
similarity index 100%
rename from test/integ/sso/test_unit_mfa_cache.py
rename to test/integ/sso_it/test_unit_mfa_cache.py
diff --git a/test/integ/sso/test_unit_sso_connection.py b/test/integ/sso_it/test_unit_sso_connection.py
similarity index 100%
rename from test/integ/sso/test_unit_sso_connection.py
rename to test/integ/sso_it/test_unit_sso_connection.py