diff --git a/tests/Makefile b/tests/Makefile
index e375155b57f..9b70acd201e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -19,8 +19,6 @@ ENABLE_GRAPH_SSL ?= false
 ENABLE_META_SSL ?= false
 CA_SIGNED ?= false
 CONTAINERIZED ?= false
-FAILED_LOGIN_ATTEMPTS ?= 0
-PASSWORD_LOCK_TIME_IN_SECS ?= 0
 
 # commands
 gherkin_fmt = ~/.local/bin/reformat-gherkin
diff --git a/tests/common/nebula_service.py b/tests/common/nebula_service.py
index 3c4364974b8..c5b42a87ce1 100644
--- a/tests/common/nebula_service.py
+++ b/tests/common/nebula_service.py
@@ -225,6 +225,9 @@ def _make_params(self, **kwargs):
         self.graphd_param['system_memory_high_watermark_ratio'] = '0.95'
         self.graphd_param['num_rows_to_check_memory'] = '4'
         self.graphd_param['session_reclaim_interval_secs'] = '2'
+        # Login retry
+        self.graphd_param['failed_login_attempts'] = '5'
+        self.graphd_param['password_lock_time_in_secs'] = '10'
 
         self.storaged_param = copy.copy(_params)
         self.storaged_param['local_config'] = 'false'
diff --git a/tests/tck/features/admin/Authentication.feature b/tests/tck/features/admin/Authentication.feature
index 916d4e34c42..b5ec53930e8 100644
--- a/tests/tck/features/admin/Authentication.feature
+++ b/tests/tck/features/admin/Authentication.feature
@@ -34,7 +34,7 @@ Feature: Test Authentication
       """
     When login "graphd[1]" with "user1" and "wrongPassword" should fail:
       """
-      5 times consecutive incorrect passwords has been input, user name: user2 has been blocked, try again in 10 seconds
+      5 times consecutive incorrect passwords has been input, user name: user1 has been blocked, try again in 10 seconds
       """
     Then wait 11 seconds
     When login "graphd[1]" with "user1" and "wrongPassword" should fail: