diff --git a/.gitignore b/.gitignore
index a8a2a85e..5aa92bd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,9 @@ target
 .project
 .idea
 *.iml
+.vscode/
 basic/periodic-handler.log
+
+# Smart Testing Exclusions
+.smart-testing/
+
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 00000000..c76f8818
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+  <extension>
+    <groupId>org.arquillian.smart.testing</groupId>
+    <artifactId>maven-lifecycle-extension</artifactId>
+    <version>0.0.6</version>
+  </extension>
+</extensions>
diff --git a/basic/src/test/java/org/jboss/hal/testsuite/test/configuration/datasources/TestConnectionTestCase.java b/basic/src/test/java/org/jboss/hal/testsuite/test/configuration/datasources/TestConnectionTestCase.java
index 1af35236..edf092e6 100644
--- a/basic/src/test/java/org/jboss/hal/testsuite/test/configuration/datasources/TestConnectionTestCase.java
+++ b/basic/src/test/java/org/jboss/hal/testsuite/test/configuration/datasources/TestConnectionTestCase.java
@@ -4,6 +4,7 @@
 import org.apache.commons.lang3.RandomStringUtils;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.hal.testsuite.category.KnownIssue;
 import org.jboss.hal.testsuite.category.Shared;
 import org.jboss.hal.testsuite.creaper.ManagementClientProvider;
 import org.jboss.hal.testsuite.creaper.ResourceVerifier;
@@ -171,6 +172,7 @@ public void invalidXADatasource() {
     }
 
     @Test
+    @Category(KnownIssue.class)
     public void testValidXAConnectionInWizardAndCancel() throws Exception {
         datasourcesPage.invokeAddXADatasource();
 
diff --git a/basic/src/test/java/org/jboss/hal/testsuite/test/configuration/elytron/other/ElytronPolicyTestCase.java b/basic/src/test/java/org/jboss/hal/testsuite/test/configuration/elytron/other/ElytronPolicyTestCase.java
index 7167b337..f5f0235b 100644
--- a/basic/src/test/java/org/jboss/hal/testsuite/test/configuration/elytron/other/ElytronPolicyTestCase.java
+++ b/basic/src/test/java/org/jboss/hal/testsuite/test/configuration/elytron/other/ElytronPolicyTestCase.java
@@ -6,6 +6,7 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.dmr.ModelNode;
 import org.jboss.hal.testsuite.category.Elytron;
+import org.jboss.hal.testsuite.category.KnownIssue;
 import org.jboss.hal.testsuite.creaper.ResourceVerifier;
 import org.jboss.hal.testsuite.dmr.ModelNodeGenerator;
 import org.jboss.hal.testsuite.fragment.ConfigFragment;
@@ -291,6 +292,7 @@ public void testEditJACCPolicy() throws Exception {
     }
 
     @Test
+    @Category(KnownIssue.class)
     public void testEditJACCPolicySingleAttribute() throws Exception {
         final String jaccPolicyName = randomAlphabetic(7);
         final String defaultModuleName = policyModuleName;
diff --git a/basic/src/test/java/org/jboss/hal/testsuite/test/runtime/deployments/ManagedDeploymentsTestCase.java b/basic/src/test/java/org/jboss/hal/testsuite/test/runtime/deployments/ManagedDeploymentsTestCase.java
index 7e39bebf..fbb391dd 100644
--- a/basic/src/test/java/org/jboss/hal/testsuite/test/runtime/deployments/ManagedDeploymentsTestCase.java
+++ b/basic/src/test/java/org/jboss/hal/testsuite/test/runtime/deployments/ManagedDeploymentsTestCase.java
@@ -4,6 +4,7 @@
 import org.jboss.arquillian.drone.api.annotation.Drone;
 import org.jboss.arquillian.graphene.page.Page;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.hal.testsuite.category.KnownIssue;
 import org.jboss.hal.testsuite.category.Standalone;
 import org.jboss.hal.testsuite.creaper.ManagementClientProvider;
 import org.jboss.hal.testsuite.creaper.command.DeployCommand;
@@ -391,6 +392,7 @@ public void medExplodedDeploymentFlagFalseInViewInfoSuccessExpected() {
     }
 
     @Test
+    @Category(KnownIssue.class)
     public void medExplodedDeploymentFlagTrueInViewInfoSuccessExpected() {
         page.navigateToDeploymentAndInvokeView(DEPLOYMENT_MANAGED_ENABLED_8);
 
diff --git a/basic/src/test/java/org/jboss/hal/testsuite/test/runtime/messaging/XaJmsMetricsTestCase.java b/basic/src/test/java/org/jboss/hal/testsuite/test/runtime/messaging/XaJmsMetricsTestCase.java
index e0c5de24..43157f39 100644
--- a/basic/src/test/java/org/jboss/hal/testsuite/test/runtime/messaging/XaJmsMetricsTestCase.java
+++ b/basic/src/test/java/org/jboss/hal/testsuite/test/runtime/messaging/XaJmsMetricsTestCase.java
@@ -16,6 +16,7 @@
 import org.jboss.arquillian.graphene.page.Page;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.dmr.ModelNode;
+import org.jboss.hal.testsuite.category.KnownIssue;
 import org.jboss.hal.testsuite.category.Shared;
 import org.jboss.hal.testsuite.creaper.ManagementClientProvider;
 import org.jboss.hal.testsuite.creaper.ResourceVerifier;
@@ -121,6 +122,7 @@ public static void afterClass() throws Exception {
      * the connection factory and verify against management model that displayed statistics have changed correctly.
      */
     @Test
+    @Category(KnownIssue.class)
     public void jmsXaPoolStatisticsTest() throws Exception {
         generateStats();
         page.navigateToDefaultProviderStats().switchToPooledConnectionFactory()
diff --git a/common/src/main/java/org/jboss/hal/testsuite/category/KnownIssue.java b/common/src/main/java/org/jboss/hal/testsuite/category/KnownIssue.java
new file mode 100644
index 00000000..b6be1ffe
--- /dev/null
+++ b/common/src/main/java/org/jboss/hal/testsuite/category/KnownIssue.java
@@ -0,0 +1,4 @@
+package org.jboss.hal.testsuite.category;
+
+public interface KnownIssue {
+}
diff --git a/pom.xml b/pom.xml
index f88528f6..8cbd9dd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
       <artifactId>selenium-bom</artifactId>
       <version>2.39.0</version>
       <type>pom</type>
-      <scope>import</scope>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -378,6 +378,16 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>withoutKnownIssues</id>
+      <properties>
+        <test.excluded.category>
+          org.jboss.hal.testsuite.category.KnownIssue
+        </test.excluded.category>
+      </properties>
+    </profile>
+
+
   </profiles>
 
   <build>
@@ -403,10 +413,10 @@
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.20.1</version>
         <configuration>
           <systemPropertyVariables>
             <browser>${browser}</browser>
@@ -421,8 +431,6 @@
             <arq.managementPort>${arq.managementPort}</arq.managementPort>
           </systemPropertyVariables>
           <argLine>${argLine}</argLine>
-          <groups>${test.included.category}</groups>
-          <excludedGroups>${mode.excluded.category},${test.excluded.category}</excludedGroups>
         </configuration>
       </plugin>
 
@@ -452,6 +460,7 @@
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <consoleOutput>true</consoleOutput>
               <failsOnError>true</failsOnError>
+              <linkXRef>false</linkXRef>
               <configLocation>checkstyle.xml</configLocation>
             </configuration>
           </execution>
@@ -476,7 +485,6 @@
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>