diff --git a/driver/config/config_test.go b/driver/config/config_test.go
index b7fdd214010..e745e2bb4a8 100644
--- a/driver/config/config_test.go
+++ b/driver/config/config_test.go
@@ -1041,8 +1041,8 @@ func TestIdentitySchemaValidation(t *testing.T) {
 				for !success {
 					for _, v := range hook.AllEntries() {
 						s, err := v.String()
-						assert.NoErrorf(t, err, "Unexpected Error")
-						success = strings.Contains(s, "The changed identity schema configuration is invalid and could not be loaded.")
+						require.NoError(t, err)
+						success = success || strings.Contains(s, "The changed identity schema configuration is invalid and could not be loaded.")
 					}
 
 					select {