diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt
index e30d20c9dd9..06d23fd42fb 100644
--- a/test/sanity/ignore.txt
+++ b/test/sanity/ignore.txt
@@ -6594,14 +6594,14 @@ test/units/modules/source_control/gitlab/test_gitlab_runner.py future-import-boi
 test/units/modules/source_control/gitlab/test_gitlab_runner.py metaclass-boilerplate
 test/units/modules/source_control/gitlab/test_gitlab_user.py future-import-boilerplate
 test/units/modules/source_control/gitlab/test_gitlab_user.py metaclass-boilerplate
-test/units/modules/source_control/test_bitbucket_access_key.py future-import-boilerplate
-test/units/modules/source_control/test_bitbucket_access_key.py metaclass-boilerplate
-test/units/modules/source_control/test_bitbucket_pipeline_key_pair.py future-import-boilerplate
-test/units/modules/source_control/test_bitbucket_pipeline_key_pair.py metaclass-boilerplate
-test/units/modules/source_control/test_bitbucket_pipeline_known_host.py future-import-boilerplate
-test/units/modules/source_control/test_bitbucket_pipeline_known_host.py metaclass-boilerplate
-test/units/modules/source_control/test_bitbucket_pipeline_variable.py future-import-boilerplate
-test/units/modules/source_control/test_bitbucket_pipeline_variable.py metaclass-boilerplate
+test/units/modules/source_control/bitbucket/test_bitbucket_access_key.py future-import-boilerplate
+test/units/modules/source_control/bitbucket/test_bitbucket_access_key.py metaclass-boilerplate
+test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_key_pair.py future-import-boilerplate
+test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_key_pair.py metaclass-boilerplate
+test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_known_host.py future-import-boilerplate
+test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_known_host.py metaclass-boilerplate
+test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_variable.py future-import-boilerplate
+test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_variable.py metaclass-boilerplate
 test/units/modules/storage/hpe3par/test_ss_3par_cpg.py future-import-boilerplate
 test/units/modules/storage/hpe3par/test_ss_3par_cpg.py metaclass-boilerplate
 test/units/modules/storage/netapp/test_na_elementsw_cluster_config.py future-import-boilerplate
diff --git a/test/units/modules/source_control/bitbucket/__init__.py b/test/units/modules/source_control/bitbucket/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/units/modules/source_control/test_bitbucket_access_key.py b/test/units/modules/source_control/bitbucket/test_bitbucket_access_key.py
similarity index 100%
rename from test/units/modules/source_control/test_bitbucket_access_key.py
rename to test/units/modules/source_control/bitbucket/test_bitbucket_access_key.py
diff --git a/test/units/modules/source_control/test_bitbucket_pipeline_key_pair.py b/test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_key_pair.py
similarity index 100%
rename from test/units/modules/source_control/test_bitbucket_pipeline_key_pair.py
rename to test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_key_pair.py
diff --git a/test/units/modules/source_control/test_bitbucket_pipeline_known_host.py b/test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_known_host.py
similarity index 100%
rename from test/units/modules/source_control/test_bitbucket_pipeline_known_host.py
rename to test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_known_host.py
diff --git a/test/units/modules/source_control/test_bitbucket_pipeline_variable.py b/test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_variable.py
similarity index 100%
rename from test/units/modules/source_control/test_bitbucket_pipeline_variable.py
rename to test/units/modules/source_control/bitbucket/test_bitbucket_pipeline_variable.py