diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 455cf6b5..e32f5c41 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,6 +2,8 @@ steps:
   - label: ":hammer_and_wrench: Unit Test"
     command: "authelia-scripts --log-level debug ci"
 
+  - wait
+
   - label: ":docker: Image Builds"
     command: ".buildkite/steps/buildimages.sh | buildkite-agent pipeline upload"
     agents:
diff --git a/internal/handlers/handler_firstfactor_test.go b/internal/handlers/handler_firstfactor_test.go
index 6129592a..655d2045 100644
--- a/internal/handlers/handler_firstfactor_test.go
+++ b/internal/handlers/handler_firstfactor_test.go
@@ -171,10 +171,10 @@ func (s *FirstFactorSuite) TestShouldAuthenticateUserWithRememberMeChecked() {
 		Return(nil)
 
 	s.mock.Ctx.Request.SetBodyString(`{
-			"username": "test",
-			"password": "hello",
-			"keepMeLoggedIn": true
-		}`)
+		"username": "test",
+		"password": "hello",
+		"keepMeLoggedIn": true
+	}`)
 	FirstFactorPost(s.mock.Ctx)
 
 	// Respond with 200.
@@ -210,10 +210,10 @@ func (s *FirstFactorSuite) TestShouldAuthenticateUserWithRememberMeUnchecked() {
 		Return(nil)
 
 	s.mock.Ctx.Request.SetBodyString(`{
-			"username": "test",
-			"password": "hello",
-			"keepMeLoggedIn": false
-		}`)
+		"username": "test",
+		"password": "hello",
+		"keepMeLoggedIn": false
+	}`)
 	FirstFactorPost(s.mock.Ctx)
 
 	// Respond with 200.