diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dcc392b4..0551bbac 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,6 +52,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     env:
+      ELASTICSEARCH_USERNAME: elastic
       ELASTIC_PASSWORD: password
       KIBANA_SYSTEM_USERNAME: kibana_system
       KIBANA_SYSTEM_PASSWORD: password
@@ -98,6 +99,7 @@ jobs:
           KIBANA_HOST: http://kibana:5601
           KIBANA_FLEET_SETUP: "1"
           KIBANA_FLEET_PASSWORD: ${{ env.ELASTIC_PASSWORD }}
+          KIBANA_FLEET_USERNAME: ${{ env.ELASTICSEARCH_USERNAME }}
         ports:
           - 8220:8220
         options: --restart="unless-stopped"
diff --git a/Makefile b/Makefile
index 9d7c500f..db489bf7 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ docker-kibana-with-tls: docker-network docker-elasticsearch set-kibana-password
 		-e LOGGING_ROOT_LEVEL=debug \
 		--name $(KIBANA_NAME) \
 		--network $(ELASTICSEARCH_NETWORK) \
-		--health-cmd="$$(curl -w '%{http_code}' -k https://localhost:5601/api/status) | grep -q '200'" \
+		--health-cmd=curl -k https://localhost:5601/api/status \
 		--health-interval=10s --health-timeout=5s --health-retries=10 \
 		docker.elastic.co/kibana/kibana:$(STACK_VERSION)
 	@ $(call wait_until_healthy, $(KIBANA_NAME))