diff --git a/scripts/test b/scripts/test
index 0c1ce3e4c2..6b5bc19881 100755
--- a/scripts/test
+++ b/scripts/test
@@ -34,4 +34,40 @@ echo "Did test-run-lazypull $?"
 E2E_OUTPUT=$artifacts test-run-sonobuoy serial
 echo "Did test-run-sonobuoy serial $?"
 
+# ---
+
+if [ "$DRONE_BUILD_EVENT" = 'tag' ]; then
+  E2E_OUTPUT=$artifacts test-run-sonobuoy parallel
+  echo "Did test-run-sonobuoy parallel $?"
+  early-exit 'Skipping remaining tests on tag.'
+fi
+# ---
+
+test-run-sonobuoy etcd serial
+echo "Did test-run-sonobuoy-etcd serial $?"
+test-run-sonobuoy mysql serial
+echo "Did test-run-sonobuoy-mysqk serial $?"
+test-run-sonobuoy postgres serial
+echo "Did test-run-sonobuoy-postgres serial $?"
+
+# Wait until all serial tests have finished
+delay=15
+(
+set +x
+while [ $(count-running-tests) -ge 1 ]; do
+    sleep $delay
+done
+)
+E2E_OUTPUT=$artifacts test-run-sonobuoy parallel
+echo "Did test-run-sonobuoy parallel $?"
+test-run-sonobuoy etcd parallel
+echo "Did test-run-sonobuoy-etcd parallel $?"
+test-run-sonobuoy mysql parallel
+echo "Did test-run-sonobuoy-mysql parallel $?"
+test-run-sonobuoy postgres parallel
+echo "Did test-run-sonobuoy-postgres parallel $?"
+
+
+
+
 exit 0
diff --git a/tests/e2e/dualstack/dualstack_test.go b/tests/e2e/dualstack/dualstack_test.go
index 20201f645e..dad2f0589c 100644
--- a/tests/e2e/dualstack/dualstack_test.go
+++ b/tests/e2e/dualstack/dualstack_test.go
@@ -201,7 +201,7 @@ var _ = Describe("Verify DualStack Configuration", Ordered, func() {
 
 var failed bool
 var _ = AfterEach(func() {
-	failed = failed || CurrentGinkgoTestDescription().Failed
+	failed = failed || CurrentSpecReport().Failed()
 })
 
 var _ = AfterSuite(func() {
diff --git a/tests/e2e/splitserver/splitserver_test.go b/tests/e2e/splitserver/splitserver_test.go
index 02e60b644b..70f6b9f543 100644
--- a/tests/e2e/splitserver/splitserver_test.go
+++ b/tests/e2e/splitserver/splitserver_test.go
@@ -221,7 +221,7 @@ var _ = Describe("Verify Create", Ordered, func() {
 
 var failed = false
 var _ = AfterEach(func() {
-	failed = failed || CurrentGinkgoTestDescription().Failed
+	failed = failed || CurrentSpecReport().Failed()
 })
 
 var _ = AfterSuite(func() {
diff --git a/tests/e2e/upgradecluster/upgradecluster_test.go b/tests/e2e/upgradecluster/upgradecluster_test.go
index 5f58f14dbc..e5f30c3304 100644
--- a/tests/e2e/upgradecluster/upgradecluster_test.go
+++ b/tests/e2e/upgradecluster/upgradecluster_test.go
@@ -375,7 +375,7 @@ var _ = Describe("Verify Upgrade", Ordered, func() {
 
 var failed = false
 var _ = AfterEach(func() {
-	failed = failed || CurrentGinkgoTestDescription().Failed
+	failed = failed || CurrentSpecReport().Failed()
 })
 
 var _ = AfterSuite(func() {