diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoFilterServletAdapterTest.java
index a9ce39a16d..2e743e5701 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoFilterServletAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoFilterServletAdapterTest.java
@@ -20,6 +20,13 @@ public abstract class AbstractDemoFilterServletAdapterTest extends AbstractDemoS
 
     }
 
+    @Test
+    @Override
+    @Ignore
+    public void testAuthenticatedWithCustomSessionConfig() {
+
+    }
+
     @Test
     @Override
     @Ignore
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLFilterServletAdapterTest.java
index f2ba5aee8d..ae64a74f24 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLFilterServletAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLFilterServletAdapterTest.java
@@ -38,8 +38,6 @@ public abstract class AbstractSAMLFilterServletAdapterTest extends AbstractSAMLS
         testRealmLoginPage.form().login(bburkeUser);
         employee2ServletPage.checkRolesEndPoint(true);
         employee2ServletPage.logout();
-
-        forbiddenIfNotAuthenticated = false;
     }
 
     @After
@@ -72,7 +70,7 @@ public abstract class AbstractSAMLFilterServletAdapterTest extends AbstractSAMLS
     @Test
     @Override
     @Ignore
-    public void testErrorHandling() {
+    public void testErrorHandlingUnsigned() {
 
     }
 }
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
index 52ea7f7412..1d0b7f7be7 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
@@ -802,7 +802,7 @@ public abstract class AbstractSAMLServletsAdapterTest extends AbstractServletsAd
         assertCurrentUrlStartsWith(testRealmSAMLPostLoginPage);
         testRealmSAMLPostLoginPage.form().login("bburke", "password");
 
-        waitUntilElement(By.xpath("//body")).text().contains("Error info: SamlAuthenticationError [reason=INVALID_SIGNATURE, status=null]");
+        waitUntilElement(By.xpath("//body")).text().contains("Error info: SamlAuthenticationError [reason=INVALID_SIGNATURE");
         assertEquals(driver.getCurrentUrl(), badAssertionSalesPostSigPage + "/saml");
     }
 
@@ -812,30 +812,28 @@ public abstract class AbstractSAMLServletsAdapterTest extends AbstractServletsAd
         assertCurrentUrlStartsWith(testRealmSAMLPostLoginPage);
         testRealmSAMLPostLoginPage.form().login("bburke", "password");
 
-        waitUntilElement(By.xpath("//body")).text().contains("Error info: SamlAuthenticationError [reason=INVALID_SIGNATURE, status=null]");
+        waitUntilElement(By.xpath("//body")).text().contains("Error info: SamlAuthenticationError [reason=INVALID_SIGNATURE");
         assertEquals(driver.getCurrentUrl(), missingAssertionSigPage + "/saml");
     }
 
     @Test
-    public void testErrorHandling() throws Exception {
+    public void testErrorHandlingUnsigned() throws Exception {
         Client client = ClientBuilder.newClient();
         // make sure
-        Response response = client.target(employeeSigServletPage.toString()).request().get();
+        Response response = client.target(employeeServletPage.toString()).request().get();
         response.close();
         SAML2ErrorResponseBuilder builder = new SAML2ErrorResponseBuilder()
-                .destination(employeeSigServletPage.toString() + "/saml")
+                .destination(employeeServletPage.toString() + "/saml")
                 .issuer("http://localhost:" + System.getProperty("auth.server.http.port", "8180") + "/realms/demo")
                 .status(JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get());
         BaseSAML2BindingBuilder binding = new BaseSAML2BindingBuilder()
                 .relayState(null);
         Document document = builder.buildDocument();
-        URI uri = binding.redirectBinding(document).generateURI(employeeSigServletPage.toString() + "/saml", false);
+        URI uri = binding.redirectBinding(document).generateURI(employeeServletPage.toString() + "/saml", false);
         response = client.target(uri).request().get();
         String errorPage = response.readEntity(String.class);
         response.close();
-        Assert.assertTrue(errorPage.contains("Error info: SamlAuthenticationError [reason=ERROR_STATUS"));
-        Assert.assertFalse(errorPage.contains("status=null"));
-        client.close();
+        Assert.assertEquals(403, response.getStatus());
     }
 
     @Test
@@ -1003,14 +1001,6 @@ public abstract class AbstractSAMLServletsAdapterTest extends AbstractServletsAd
     }
 
     private void assertOnForbiddenPage() {
-        switch (System.getProperty("app.server")) {
-            case "eap6":
-                waitUntilElement(By.xpath("//body")).text().not().contains("principal=");
-                String source = driver.getPageSource();
-                assertTrue(source.isEmpty() || source.contains("<body></body>"));
-                break;
-            default:
-                waitUntilElement(By.xpath("//body")).text().contains(FORBIDDEN_TEXT);
-        }
+        waitUntilElement(By.xpath("//body")).text().contains(FORBIDDEN_TEXT);
     }
 }