diff --git a/tests/testcases/Group8-Configuration/8-01-Authentication-edit-authentication.md b/tests/testcases/Group8-Configuration/8-01-Authentication-edit-authentication.md
index 64f39ef38..99964a3ee 100644
--- a/tests/testcases/Group8-Configuration/8-01-Authentication-edit-authentication.md
+++ b/tests/testcases/Group8-Configuration/8-01-Authentication-edit-authentication.md
@@ -3,7 +3,7 @@ Test 8-01 -Update-authentication-mode
 
 # Purpose:
 
-To verify that an admin user can update authentication mode(This will work only the first time).  
+To verify that an admin user can update authentication mode.  
 
 # References:
 User guide
@@ -13,12 +13,21 @@ User guide
 * A linux host with Docker CLI installed (Docker client).
 
 # Test Steps:
+**NOTE:**
+Before this test, make sure there is only admin user in the system.  
 
-TBD
+1. Login UI as admin user.  
+2. In configuration page,change authentication mode from DB to LDAP or from LDAP to DB.  
+3. Save the configuration.  
+4. In ldap_auth mode, fill in the ldap info and click test ldap server.  
+5. Add or sign up a user.(For LDAP, login a user)
+6. Change the configuration again.  
 
 # Expected Outcome:
 
-TBD
+* In step2, user can change authentication mode.  
+* In step4, if settings are correct, test will successful.  
+* In step6, user cannot change authentication mode.
 
 # Possible Problems:
 None
diff --git a/tests/testcases/Group8-Configuration/8-02-Authentication-edit-project-creation-restriction.md b/tests/testcases/Group8-Configuration/8-02-Authentication-edit-project-creation-restriction.md
index e44563bdc..3f697436c 100644
--- a/tests/testcases/Group8-Configuration/8-02-Authentication-edit-project-creation-restriction.md
+++ b/tests/testcases/Group8-Configuration/8-02-Authentication-edit-project-creation-restriction.md
@@ -14,11 +14,15 @@ User guide
 
 # Test Steps:
 
-TBD
+1. Login UI as admin user.  
+2. In configuration page, change Project Creation Restriction from everyone to admin only.  
+3. Logout admin user.  
+4. Login as non-admin user.  
+5. Try to add a project.  
 
 # Expected Outcome:
 
-TBD
+* In step5, non-admin user will not see the add project button.
 
 # Possible Problems:
 None
diff --git a/tests/testcases/Group8-Configuration/8-03-Authentication-edit-self-registration.md b/tests/testcases/Group8-Configuration/8-03-Authentication-edit-self-registration.md
index f01fdd74e..870d56cc3 100644
--- a/tests/testcases/Group8-Configuration/8-03-Authentication-edit-self-registration.md
+++ b/tests/testcases/Group8-Configuration/8-03-Authentication-edit-self-registration.md
@@ -6,6 +6,7 @@ Test 8-03 - Update self-registration
 To verify that an admin user can update self-registration setting.
 
 # References:
+
 User guide
 
 # Environment:
@@ -14,11 +15,13 @@ User guide
 
 # Test Steps:
 
-TBD
+1. Login UI as admin user.  
+2. In configuration page, uncheck self registration.  
+3. Save configuration and logout.  
 
 # Expected Outcome:
 
-TBD
+* In login page, sign up link will disappear.
 
 # Possible Problems:
 None
diff --git a/tests/testcases/Group8-Configuration/8-04-Replication-edit-verify-remote-certificate.md b/tests/testcases/Group8-Configuration/8-04-Replication-edit-verify-remote-certificate.md
index de06deb37..b958d00a6 100644
--- a/tests/testcases/Group8-Configuration/8-04-Replication-edit-verify-remote-certificate.md
+++ b/tests/testcases/Group8-Configuration/8-04-Replication-edit-verify-remote-certificate.md
@@ -14,11 +14,15 @@ User guide
 
 # Test Steps:
 
-TBD
+1. Login UI as admin user.
+2. In configuration replication page, uncheck verify remote certificate settings.
+3. Save settings.
+4. Add an end point that use a selfsigned certificate.
+5. Add a replication rule of any project and enable the rule.  
 
 # Expected Outcome:
 
-TBD
+* In step5, project can be replicated. 
 
 # Possible Problems:
 None
diff --git a/tests/testcases/Group8-Configuration/8-05-Email-edit-email-settings.md b/tests/testcases/Group8-Configuration/8-05-Email-edit-email-settings.md
index 5ba093737..26c381e07 100644
--- a/tests/testcases/Group8-Configuration/8-05-Email-edit-email-settings.md
+++ b/tests/testcases/Group8-Configuration/8-05-Email-edit-email-settings.md
@@ -14,11 +14,16 @@ User guide
 
 # Test Steps:
 
-TBD
+1. Login UI as admin user.  
+2. In configuration email page, change email settings.  
+3. Save settings and logout.  
+4. Login to check if email settings has been saved.  
+5. Click test mail server.  
 
 # Expected Outcome:
 
-TBD
+* In step4, email settings can be saved.
+* In step5, if email settings are correct, test will successful.
 
 # Possible Problems:
 None