diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
index df28be1d35..cf3c99255d 100644
--- a/e2e/protractor.conf.js
+++ b/e2e/protractor.conf.js
@@ -105,7 +105,9 @@ exports.config = {
 
     suites: {
         smokeTestCore: [
-            "./core/login/**/*.e2e.ts",
+            "./core/login-sso/login-sso.e2e.ts",
+            "./core/login/login-component.e2e.ts",
+            "./core/login/remember-me.e2e.ts",
             "./core/viewer/**/*.e2e.ts"
         ],
         smokeTestCsSearch: [
@@ -116,8 +118,7 @@ exports.config = {
         smokeTestPs: [
             "./process-services/process/**/*.e2e.ts",
             "./process-services/form/**/*.e2e.ts",
-            "./process-services-cloud/process/**/*.e2e.ts",
-            "./process-services-cloud/form-field/**/*.e2e.ts"
+            "./process-services-cloud/process/**/*.e2e.ts"
         ]
     },
 
diff --git a/lib/testing/src/lib/core/actions/api.service.ts b/lib/testing/src/lib/core/actions/api.service.ts
index 71682bc368..e387f4b83e 100644
--- a/lib/testing/src/lib/core/actions/api.service.ts
+++ b/lib/testing/src/lib/core/actions/api.service.ts
@@ -97,7 +97,7 @@ export class ApiService {
             try {
                 await this.apiService.login(profile.username, profile.password);
             } catch (error) {
-                Logger.error(`Failed to login with ${profile.username}`, error.message);
+                Logger.error(`Failed to login with ${profile.username}`, error?.message);
                 throw new Error(`Login failed with ${profile.username}`);
             }
         } else {