diff --git a/Makefile b/Makefile
index a01575de516..7306e566aae 100644
--- a/Makefile
+++ b/Makefile
@@ -206,15 +206,13 @@ units-non-plugin: install-test-deps
 	@rm -f $(wildcard fixtures/plugins/*.exe)
 	@ginkgo version
 	CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \
-		-skip-package integration,cf\ssh,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword
-	CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flake-attempts 3 cf/ssh
+		-skip-package integration,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword
 else
 units-non-plugin: install-test-deps
 	@rm -f $(wildcard fixtures/plugins/*.exe)
 	@ginkgo version
 	CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \
-		-skip-package integration,cf/ssh,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword
-	CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flake-attempts 3 cf/ssh
+		-skip-package integration,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword
 endif
 
 units-full: build units-plugin units-non-plugin
diff --git a/util/clissh/ssh_test.go b/util/clissh/ssh_test.go
index 18d07e0577d..2451e2a39d0 100644
--- a/util/clissh/ssh_test.go
+++ b/util/clissh/ssh_test.go
@@ -50,7 +50,7 @@ func BlockAcceptOnClose(fake *fake_net.FakeListener) {
 	}
 }
 
-var _ = Describe("CLI SSH", Serial, func() {
+var _ = Describe("CLI SSH", Serial, FlakeAttempts(9), func() {
 	var (
 		fakeSecureDialer    *clisshfakes.FakeSecureDialer
 		fakeSecureClient    *clisshfakes.FakeSecureClient