diff --git a/system_tests/system_test.go b/system_tests/system_test.go
index c5ca67d69..a71a204de 100644
--- a/system_tests/system_test.go
+++ b/system_tests/system_test.go
@@ -568,7 +568,7 @@ CONSOLE_LOG=new`
 			}
 			Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 			waitForRabbitmqRunning(cluster)
-			waitForPortReadiness(cluster, 1883) // mqtt
+			waitForPortReadiness(cluster, 1883)  // mqtt
 			waitForPortReadiness(cluster, 61613) // stomp
 
 			hostname = kubernetesNodeIp(ctx, clientSet)
@@ -594,14 +594,13 @@ CONSOLE_LOG=new`
 			By("Streams")
 			if !hasFeatureEnabled(cluster, "stream_queue") {
 				Skip("rabbitmq_stream plugin is not supported by RabbitMQ image " + cluster.Spec.Image)
-			}else {
+			} else {
 				waitForPortConnectivity(cluster)
 				waitForPortReadiness(cluster, 5552) // stream
 				publishAndConsumeStreamMsg(hostname, rabbitmqNodePort(ctx, clientSet, cluster, "stream"), username, password)
 			}
 		})
 
-
 	})
 
 })
diff --git a/system_tests/utils.go b/system_tests/utils.go
index 188560ccf..db940cdd3 100644
--- a/system_tests/utils.go
+++ b/system_tests/utils.go
@@ -67,8 +67,6 @@ type featureFlag struct {
 	State string
 }
 
-
-
 func MustHaveEnv(name string) string {
 	value := os.Getenv(name)
 	if value == "" {
@@ -996,8 +994,8 @@ func publishAndConsumeStreamMsg(host, port, username, password string) {
 	portInt, err := strconv.Atoi(port)
 	Expect(err).ToNot(HaveOccurred())
 
-	var env  *stream.Environment
-	Eventually(func() error{
+	var env *stream.Environment
+	Eventually(func() error {
 		fmt.Println("connecting to stream endpoint ...")
 		env, err = stream.NewEnvironment(stream.NewEnvironmentOptions().
 			SetHost(host).
@@ -1011,7 +1009,7 @@ func publishAndConsumeStreamMsg(host, port, username, password string) {
 		if err == nil {
 			fmt.Println("connected to stream endpoint")
 			return nil
-		}else {
+		} else {
 			fmt.Printf("failed to connect to stream endpoint (%s:%d) due to %g\n", host, portInt, err)
 		}
 		return err