diff --git a/.gitmodules b/.gitmodules
index 69467c6e2c..96b24f4af0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2170,10 +2170,6 @@
 	path = python-tackerclient
 	url = ../../openstack/python-tackerclient.git
 	branch = .
-[submodule "python-tricircleclient"]
-	path = python-tricircleclient
-	url = ../../openstack/python-tricircleclient.git
-	branch = .
 [submodule "python-tripleoclient"]
 	path = python-tripleoclient
 	url = ../../openstack/python-tripleoclient.git
@@ -2382,10 +2378,6 @@
 	path = swift-bench
 	url = ../../openstack/swift-bench.git
 	branch = .
-[submodule "swift-specs"]
-	path = swift-specs
-	url = ../../openstack/swift-specs.git
-	branch = .
 [submodule "tacker"]
 	path = tacker
 	url = ../../openstack/tacker.git
@@ -2442,10 +2434,6 @@
 	path = tosca-parser
 	url = ../../openstack/tosca-parser.git
 	branch = .
-[submodule "tricircle"]
-	path = tricircle
-	url = ../../openstack/tricircle.git
-	branch = .
 [submodule "tripleo-ansible"]
 	path = tripleo-ansible
 	url = ../../openstack/tripleo-ansible.git
@@ -2582,6 +2570,10 @@
 	path = whereto
 	url = ../../openstack/whereto.git
 	branch = .
+[submodule "whitebox-tempest-plugin"]
+	path = whitebox-tempest-plugin
+	url = ../../openstack/whitebox-tempest-plugin.git
+	branch = .
 [submodule "xstatic-angular"]
 	path = xstatic-angular
 	url = ../../openstack/xstatic-angular.git
diff --git a/python-tricircleclient b/python-tricircleclient
deleted file mode 160000
index 00227dfa9a..0000000000
--- a/python-tricircleclient
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 00227dfa9a674db123d0101790d517d22e550559
diff --git a/swift-specs b/swift-specs
deleted file mode 160000
index c591d46d2e..0000000000
--- a/swift-specs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c591d46d2eac799541f30b0ed0cf3183db62466c
diff --git a/tricircle b/tricircle
deleted file mode 160000
index 60245a1b49..0000000000
--- a/tricircle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 60245a1b499c55a365d54b9a8f2a36845ad32e97
diff --git a/whitebox-tempest-plugin b/whitebox-tempest-plugin
new file mode 160000
index 0000000000..1f5adc2a13
--- /dev/null
+++ b/whitebox-tempest-plugin
@@ -0,0 +1 @@
+Subproject commit 1f5adc2a13436ec5293454be748ce95fb58c3f04