diff --git a/ragconnect.tests/build.gradle b/ragconnect.tests/build.gradle
index 35fb22701c85cdddee7c82d159d7b2089a67206d..37babe8b3dc2ea4620ea5a8e12c13b0c8084ceef 100644
--- a/ragconnect.tests/build.gradle
+++ b/ragconnect.tests/build.gradle
@@ -93,11 +93,13 @@ task allTests(type: Test, dependsOn: testClasses) {
 }
 
 task specificTest(type: Test, dependsOn: testClasses) {
-    description = 'Run test tagged with "NewTest"'
+    description = 'Run test tagged with tag given by "-PincludeTags="'
     group = 'verification'
+    String tags = project.hasProperty("includeTags") ?
+                   project.property("includeTags") : ''
 
     useJUnitPlatform {
-        includeTags 'SpecificTest'
+        includeTags tags
     }
 }
 
@@ -276,6 +278,7 @@ task compileIncremental(type: RagConnectTest) {
         inputFiles = [file('src/test/01-input/incremental/Test.relast'),
                       file('src/test/01-input/incremental/Test.connect')]
         rootNode = 'A'
+        logWrites = true
     }
     relast {
         useJastAddNames = true
@@ -343,6 +346,7 @@ task compileTreeIncremental(type: RagConnectTest) {
         inputFiles = [file('src/test/01-input/tree/Test.relast'),
                       file('src/test/01-input/tree/Test.connect')]
         rootNode = 'Root'
+        logWrites = true
     }
     relast {
         useJastAddNames = true
@@ -389,6 +393,7 @@ task compileTreeAllowedTokensIncremental(type: RagConnectTest) {
         inputFiles = [file('src/test/01-input/treeAllowedTokens/Test.relast'),
                       file('src/test/01-input/treeAllowedTokens/Test.connect')]
         rootNode = 'Root'
+        logWrites = true
     }
     relast {
         useJastAddNames = true
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IncrementalDependencyTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IncrementalDependencyTest.java
index 43fe8b349e2f10568238042276faf2d43c74271d..60d099c66bae2e74f9464e10db2673e041927be9 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IncrementalDependencyTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/IncrementalDependencyTest.java
@@ -3,6 +3,7 @@ package org.jastadd.ragconnect.tests;
 import incremental.ast.A;
 import incremental.ast.B;
 import incremental.ast.MqttHandler;
+import org.junit.jupiter.api.Tag;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -16,6 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author rschoene - Initial contribution
  */
+@Tag("Incremental")
 public class IncrementalDependencyTest extends AbstractMqttTest {
 
   private static final String TOPIC_IN = "in/a";
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
index 776e7a01b5f2c683c09cb2dfd3b3e496f41110ad..2d08ccb376a6abaadf6643b32182c1ed5c10acda 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
@@ -86,7 +86,7 @@ public class TestUtils {
   }
 
   static void waitForMqtt() throws InterruptedException {
-    TimeUnit.SECONDS.sleep(2);
+    TimeUnit.MILLISECONDS.sleep(1500);
   }
 
   @SuppressWarnings({"unused", "rawtypes"})
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensIncrementalTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensIncrementalTest.java
index 5dd1b1504701b0c5499e7277b8287e1b66a9e5a5..8661608862523a4f6707431019bf311649a0e256 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensIncrementalTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensIncrementalTest.java
@@ -18,7 +18,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author rschoene - Initial contribution
  */
-@Tag("SpecificTest")
+@Tag("Incremental")
+@Tag("Tree")
 public class TreeAllowedTokensIncrementalTest extends AbstractTreeAllowedTokensTest {
 
   private Root model;
@@ -42,6 +43,8 @@ public class TreeAllowedTokensIncrementalTest extends AbstractTreeAllowedTokensT
 
     receiverRoot = new ReceiverRoot();
     model.addReceiverRoot((ReceiverRoot) receiverRoot);
+
+    model.ragconnectCheckIncremental();
   }
 
   @Override
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java
index c3b91a04f45a47250f2cdf557575c5c48ac09c05..99aacc3859254c271a11e2a641667ea881d861f8 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeAllowedTokensManualTest.java
@@ -1,5 +1,6 @@
 package org.jastadd.ragconnect.tests;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import treeAllowedTokens.ast.*;
 
@@ -18,6 +19,7 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author rschoene - Initial contribution
  */
+@Tag("Tree")
 public class TreeAllowedTokensManualTest extends AbstractTreeAllowedTokensTest {
 
   private Root model;
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java
index e0d7c817e372395adf98565b5a44347335a2eb45..53ed8259143e2b7e7b00494f15321bfc45ab7488 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeIncrementalTest.java
@@ -1,5 +1,6 @@
 package org.jastadd.ragconnect.tests;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import treeInc.ast.*;
 
@@ -17,6 +18,8 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author rschoene - Initial contribution
  */
+@Tag("Tree")
+@Tag("Incremental")
 public class TreeIncrementalTest extends AbstractTreeTest {
 
   private Root model;
diff --git a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java
index 060317dfd749f0815af9fe42d1cb9553fe9034ae..e15ba23938be311795366738289a2160336340c5 100644
--- a/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java
+++ b/ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TreeManualTest.java
@@ -1,5 +1,6 @@
 package org.jastadd.ragconnect.tests;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import tree.ast.MqttHandler;
 import tree.ast.ReceiverRoot;
@@ -19,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  *
  * @author rschoene - Initial contribution
  */
+@Tag("Tree")
 public class TreeManualTest extends AbstractTreeTest {
 
   private Root model;