diff --git a/tests/integration/features/Shibboleth.feature b/tests/integration/features/Shibboleth.feature
index 4e39f3359..8564ed7d2 100644
--- a/tests/integration/features/Shibboleth.feature
+++ b/tests/integration/features/Shibboleth.feature
@@ -142,6 +142,8 @@ Feature: Shibboleth
     And I send a POST request to "https://localhost:4443/idp/profile/SAML2/Redirect/SSO?execution=e1s1" with the following data
       |j_username|j_password|_eventId_proceed|
       |student1  |password  |                |
+    And The response should be a SAML redirect page that gets submitted
+    And I should be redirected to "http://localhost:8080/index.php/apps/dashboard/"
     And I send a GET request with requesttoken to "http://localhost:8080/index.php/logout"
     # Set the proper attributes
     And The setting "saml-attribute-mapping-email_mapping" is set to "urn:oid:0.9.2342.19200300.100.1.3"
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index f2f434b93..3a674bd2d 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -66,9 +66,10 @@ public function after() {
 					$user
 				)
 			);
-			if (file_exists(self::ENV_CONFIG_FILE)) {
-				unlink(self::ENV_CONFIG_FILE);
-			}
+		}
+
+		if (file_exists(self::ENV_CONFIG_FILE)) {
+			unlink(self::ENV_CONFIG_FILE);
 		}
 
 		foreach ($this->changedSettings as $setting) {