diff --git a/enzevalos_iphoneTests/MailServerConfigurationTest.swift b/enzevalos_iphoneTests/MailServerConfigurationTest.swift
index 3169dc8fae4a9a9b0ad817bcfd73c0c1ddc41e88..93af41e25034c1b865098e5bdf24fb4459a426bc 100644
--- a/enzevalos_iphoneTests/MailServerConfigurationTest.swift
+++ b/enzevalos_iphoneTests/MailServerConfigurationTest.swift
@@ -278,7 +278,7 @@ class MailServerConfigurationTest: XCTestCase, MailSessionListener{
             var res = testDetailSetup(account: account, correctPW: true, imap: true, shouldFail: false)
             XCTAssertTrue(res)
             res = testDetailSetup(account: account, correctPW: true, imap: false, shouldFail: false)
-            XCTAssertTrue(res)
+            XCTAssertTrue(res, "Failed for \(account.adr)")
             res = testDetailSetup(account: account, correctPW: false, imap: true, shouldFail: false)
             XCTAssertFalse(res)
             res = testDetailSetup(account: account, correctPW: false, imap: false, shouldFail: false)
diff --git a/enzevalos_iphoneUITests/OnboardingTest.swift b/enzevalos_iphoneUITests/OnboardingTest.swift
index 63bee7c8e85abbc2280a7987d4f1a07c33e00e35..3bffc430a7aff3c2b9e393ab21714a6700f29f74 100644
--- a/enzevalos_iphoneUITests/OnboardingTest.swift
+++ b/enzevalos_iphoneUITests/OnboardingTest.swift
@@ -79,12 +79,20 @@ class OnboardingTest: XCTestCase {
     func testDetailOnboarding() {
         let accounts = OnboardingTest.loadAccounts()
         XCTAssertGreaterThan(accounts.count, 0)
+        var succ = 0
         for (_, account) in accounts {
             setUp()
             let result = runDetailOnboarding(adr: account.adr, pw: account.pw, hostIMAP: account.hostIMAP, portIMAP: account.portIMAP, conTypeIMAP: account.conTypeIMAP, hostSMTP: account.hostSMTP, portSMTP: account.portSMTP, conTypeSMTP: account.conTypeSMTP)
+            if !result {
+                print("#################\nOnboarding failed!\n\(account.adr)\n#################")
+            }
+            else {
+                succ = succ + 1
+            }
             XCTAssertTrue(result)
             tearDown()
         }
+        XCTAssertEqual(succ, accounts.count)
     }
     
     func testMultipleAttempts() {
@@ -173,7 +181,7 @@ class OnboardingTest: XCTestCase {
         enterDetailAccountData(adr: adr, pw: pw, hostIMAP: hostIMAP, portIMAP: portIMAP, conTypeIMAP: conTypeIMAP, hostSMTP: hostSMTP, portSMTP: portSMTP, conTypeSMTP: conTypeSMTP)
         
         // But detail onboarding should work!
-        let finish = app.staticTexts["Access contacts"].waitForExistence(timeout: 20)
+        let finish = app.staticTexts["Access contacts"].waitForExistence(timeout: 30)
         return finish
     }