diff --git a/pom.xml b/pom.xml
index 5db9d04a8..d869bbc45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,18 +243,16 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${surefire.version}</version>
           <configuration>
-            <excludes>
-              <exclude>**/**UITest.java</exclude>
-            </excludes>
+            <excludedGroups>de.aikiit.spamprotector.UITest</excludedGroups>
             <enableAssertions>true</enableAssertions>
             <forkCount>1</forkCount>
             <reuseForks>true</reuseForks>
             <!--systemProperties>
-                                    <property>
-                                        <name>java.awt.headless</name>
-                                        <value>true</value>
-                                    </property>
-                                </systemProperties-->
+                                                <property>
+                                                    <name>java.awt.headless</name>
+                                                    <value>true</value>
+                                                </property>
+                                            </systemProperties-->
           </configuration>
         </plugin>
       </plugins>
@@ -591,11 +589,7 @@
               <artifactId>maven-surefire-plugin</artifactId>
               <version>${surefire.version}</version>
               <configuration>
-                <includes>
-                  <include>
-                      **/*UITest.java
-                    </include>
-                </includes>
+                <groups>de.aikiit.spamprotector.UITest</groups>
                 <enableAssertions>true</enableAssertions>
                 <forkCount>1</forkCount>
                 <reuseForks>true</reuseForks>
@@ -609,6 +603,12 @@
             </plugin>
           </plugins>
         </pluginManagement>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>${surefire.version}</version>
+          </plugin>
+        </plugins>
       </build>
     </profile>
     <!-- Run mvn clean install -Plive-demo for a live demo of this tool -->
diff --git a/src/test/java/de/aikiit/spamprotector/AntiSpamAppletTest.java b/src/test/java/de/aikiit/spamprotector/AntiSpamAppletTest.java
index 68d4c48b7..53e9adc03 100644
--- a/src/test/java/de/aikiit/spamprotector/AntiSpamAppletTest.java
+++ b/src/test/java/de/aikiit/spamprotector/AntiSpamAppletTest.java
@@ -18,6 +18,7 @@
 package de.aikiit.spamprotector;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -25,7 +26,7 @@
  * @author hirsch
  * @version 2011-12-28, 13:20
  */
-@org.junit.Ignore("Not working on Travis")
+@Category(UITest.class)
 public class AntiSpamAppletTest {
     @Test
     public final void instantiationDone() {
diff --git a/src/test/java/de/aikiit/spamprotector/AntiSpamApplicationUITest.java b/src/test/java/de/aikiit/spamprotector/AntiSpamApplicationTest.java
similarity index 86%
rename from src/test/java/de/aikiit/spamprotector/AntiSpamApplicationUITest.java
rename to src/test/java/de/aikiit/spamprotector/AntiSpamApplicationTest.java
index b1cc836b5..868031f6b 100644
--- a/src/test/java/de/aikiit/spamprotector/AntiSpamApplicationUITest.java
+++ b/src/test/java/de/aikiit/spamprotector/AntiSpamApplicationTest.java
@@ -18,13 +18,16 @@
 package de.aikiit.spamprotector;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+
+import static org.junit.Assert.assertNotNull;
 
 /**
  * @author hirsch
  * @version 2011-12-28, 13:26
  */
-public class AntiSpamApplicationUITest {
+@Category(UITest.class)
+public class AntiSpamApplicationTest {
     @Test
     public final void instantiationDone() {
         AntiSpamApplication.main(null);
diff --git a/src/test/java/de/aikiit/spamprotector/GUITest.java b/src/test/java/de/aikiit/spamprotector/GUITest.java
index 4e7b9abe4..3546553d5 100644
--- a/src/test/java/de/aikiit/spamprotector/GUITest.java
+++ b/src/test/java/de/aikiit/spamprotector/GUITest.java
@@ -18,6 +18,7 @@
 package de.aikiit.spamprotector;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -25,6 +26,7 @@
  * @author hirsch
  * @version 2011-12-28, 13:57
  */
+@Category(UITest.class)
 public class GUITest {
     @Test
     public final void startGuiNoApplet() {
diff --git a/src/test/java/de/aikiit/spamprotector/UITest.java b/src/test/java/de/aikiit/spamprotector/UITest.java
new file mode 100644
index 000000000..0fc17834b
--- /dev/null
+++ b/src/test/java/de/aikiit/spamprotector/UITest.java
@@ -0,0 +1,27 @@
+/**
+ SpamSchutz - simple way to protect your mail adresses from naiive spammers
+ Copyright (C) 2011, Aiki IT
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.aikiit.spamprotector;
+
+/**
+ * Marker interface to be used with Junit categories to mark Tests that need a Graphical UI.
+ *
+ * @author hirsch
+ * @version 2016-02-13, 20:07
+ */
+public interface UITest {
+}