diff --git a/.travis.yml b/.travis.yml
index 043a67d4f..c312985fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
       env: DISPLAY=:99.0 ADDITIONAL="-Pjacoco,build-ide,test-ide coveralls:report sonar:sonar"
     # only on PR
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode10.1 # JDK 11
       env: ADDITIONAL="-Pbuild-ide,test-ide"
       if: type IN (pull_request)
 
@@ -47,4 +47,4 @@ after_success:
  - find ./edelta.parent/edelta.ui.tests/target/ -name "*.log"
 
 after_failure:
- - find ./edelta.parent/edelta.ui.tests/target/ -name "*.log" -exec cat {} \;
+ - find ./edelta.parent/*/target/work/ -name "*.log" -exec cat {} \;
diff --git a/edelta.parent/edelta.lib.tests/pom.xml b/edelta.parent/edelta.lib.tests/pom.xml
index 0d66d3da7..23d1ded38 100644
--- a/edelta.parent/edelta.lib.tests/pom.xml
+++ b/edelta.parent/edelta.lib.tests/pom.xml
@@ -16,4 +16,29 @@
     <sonar.sources></sonar.sources>
     <sonar.tests>src</sonar.tests>
   </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- 
+                Required in Java 11
+                See
+                https://bugs.eclipse.org/bugs/show_bug.cgi?id=539038
+                https://github.com/eclipse/xtext-core/pull/934 -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/edelta.parent/edelta.swtbot.tests/pom.xml b/edelta.parent/edelta.swtbot.tests/pom.xml
index 1f4e2cb19..929712326 100644
--- a/edelta.parent/edelta.swtbot.tests/pom.xml
+++ b/edelta.parent/edelta.swtbot.tests/pom.xml
@@ -15,7 +15,7 @@
 
   <properties>
     <test-work-directory>${project.build.directory}/work/edelta</test-work-directory>
-    <os-jvm-flags />
+    <additionalTestArgLine>-Dorg.eclipse.swtbot.search.timeout=10000</additionalTestArgLine>
     <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=397015 -->
     <sonar.sources></sonar.sources>
     <sonar.tests>src</sonar.tests>
@@ -33,7 +33,6 @@
         <!-- Tycho surefire should install additional bundles in the actual 
           installation directory of the unpacked Eclipse; for Mac it is different: -->
         <test-work-directory>${project.build.directory}/work/edelta.app/Contents/Eclipse/</test-work-directory>
-        <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
       </properties>
     </profile>
   </profiles>
@@ -41,17 +40,6 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <configuration>
-            <useUIHarness>true</useUIHarness>
-            <useUIThread>false</useUIThread>
-            <argLine>${os-jvm-flags} -Dorg.eclipse.swtbot.search.timeout=10000</argLine>
-            <testRuntime>p2Installed</testRuntime>
-            <work>${test-work-directory}</work>
-          </configuration>
-        </plugin>
         <!--This plugin's configuration is used to store Eclipse m2e settings 
           only. It has no influence on the Maven build itself. -->
         <plugin>
@@ -110,6 +98,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <useUIThread>false</useUIThread>
+          <testRuntime>p2Installed</testRuntime>
+          <work>${test-work-directory}</work>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/edelta.parent/edelta.tests.parent/pom.xml b/edelta.parent/edelta.tests.parent/pom.xml
index 24952dc73..465da254a 100644
--- a/edelta.parent/edelta.tests.parent/pom.xml
+++ b/edelta.parent/edelta.tests.parent/pom.xml
@@ -24,6 +24,10 @@
       <activation>
         <activeByDefault>false</activeByDefault>
       </activation>
+      <properties>
+        <!-- tycho.testArgLine is where jacoco stores the agent path -->
+        <additionalTestArgLine>${tycho.testArgLine}</additionalTestArgLine>
+      </properties>
       <build>
         <plugins>
           <plugin>
diff --git a/edelta.parent/edelta.tests/pom.xml b/edelta.parent/edelta.tests/pom.xml
index 3ca5b8a19..4cd12a3fa 100644
--- a/edelta.parent/edelta.tests/pom.xml
+++ b/edelta.parent/edelta.tests/pom.xml
@@ -1,30 +1,42 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>edelta</groupId>
-		<artifactId>edelta.tests.parent</artifactId>
-		<version>0.3.3-SNAPSHOT</version>
-		<relativePath>../edelta.tests.parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>edelta.tests</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>edelta</groupId>
+    <artifactId>edelta.tests.parent</artifactId>
+    <version>0.3.3-SNAPSHOT</version>
+    <relativePath>../edelta.tests.parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>edelta.tests</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>xtend-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<failIfNoTests>false</failIfNoTests>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.xtend</groupId>
+        <artifactId>xtend-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- Required in Java 11
+                See
+                https://bugs.eclipse.org/bugs/show_bug.cgi?id=539038
+                https://github.com/eclipse/xtext-core/pull/934 -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml
index c5bae8c92..9ef54f9d5 100644
--- a/edelta.parent/edelta.ui.tests/pom.xml
+++ b/edelta.parent/edelta.ui.tests/pom.xml
@@ -1,133 +1,118 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>edelta</groupId>
-		<artifactId>edelta.tests.parent</artifactId>
-		<version>0.3.3-SNAPSHOT</version>
-		<relativePath>../edelta.tests.parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>edelta.ui.tests</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>edelta</groupId>
+    <artifactId>edelta.tests.parent</artifactId>
+    <version>0.3.3-SNAPSHOT</version>
+    <relativePath>../edelta.tests.parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>edelta.ui.tests</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<ui-tests-properties>${os-jvm-flags} -DbuildingWithTycho=true</ui-tests-properties>
-		<argLine>${ui-tests-properties}</argLine>
-	</properties>
+  <properties>
+    <systemProperties>-DbuildingWithTycho=true</systemProperties>
+  </properties>
 
-	<profiles>
-		<profile>
-			<id>testing-on-mac</id>
-			<activation>
-				<os>
-					<family>mac</family>
-				</os>
-			</activation>
-			<properties>
-				<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>target-platform-configuration</artifactId>
-						<configuration>
-							<dependency-resolution>
-								<extraRequirements>
-									<!-- to get the org.eclipse.osgi.compatibility.state plugin if the 
-										target platform is Luna or later. (backward compatible with kepler and previous 
-										versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>org.eclipse.rcp</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-									<!-- We specify our feature so that we're sure we're using also all 
-										the required software -->
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>edelta.feature</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-									<!-- See https://github.com/LorenzoBettini/jbase/issues/3 https://www.eclipse.org/forums/index.php/t/1073366/ -->
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>org.eclipse.jdt</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-								</extraRequirements>
-							</dependency-resolution>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>testing-NOT-on-mac</id>
-			<activation>
-				<os>
-					<family>!mac</family>
-				</os>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>target-platform-configuration</artifactId>
-						<configuration>
-							<dependency-resolution>
-								<extraRequirements>
-									<!-- to get the org.eclipse.osgi.compatibility.state plugin if the 
-										target platform is Luna or later. (backward compatible with kepler and previous 
-										versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>org.eclipse.rcp</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-									<!-- We specify our feature so that we're sure we're using also all 
-										the required software -->
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>edelta.feature</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-								</extraRequirements>
-							</dependency-resolution>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>jacoco</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<properties>
-				<!-- tycho.testArgLine set by jacoco -->
-				<argLine>${tycho.testArgLine} ${ui-tests-properties}</argLine>
-			</properties>
-		</profile>
-	</profiles>
+  <profiles>
+    <profile>
+      <id>testing-on-mac</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <dependency-resolution>
+                <extraRequirements>
+                  <!-- to get the org.eclipse.osgi.compatibility.state plugin 
+                    if the target platform is Luna or later. (backward compatible with kepler 
+                    and previous versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
+                  <requirement>
+                    <type>eclipse-feature</type>
+                    <id>org.eclipse.rcp</id>
+                    <versionRange>0.0.0</versionRange>
+                  </requirement>
+                  <!-- We specify our feature so that we're sure we're using 
+                    also all the required software -->
+                  <requirement>
+                    <type>eclipse-feature</type>
+                    <id>edelta.feature</id>
+                    <versionRange>0.0.0</versionRange>
+                  </requirement>
+                  <!-- See https://github.com/LorenzoBettini/jbase/issues/3 
+                    https://www.eclipse.org/forums/index.php/t/1073366/ -->
+                  <requirement>
+                    <type>eclipse-feature</type>
+                    <id>org.eclipse.jdt</id>
+                    <versionRange>0.0.0</versionRange>
+                  </requirement>
+                </extraRequirements>
+              </dependency-resolution>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>testing-NOT-on-mac</id>
+      <activation>
+        <os>
+          <family>!mac</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <dependency-resolution>
+                <extraRequirements>
+                  <!-- to get the org.eclipse.osgi.compatibility.state plugin 
+                    if the target platform is Luna or later. (backward compatible with kepler 
+                    and previous versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
+                  <requirement>
+                    <type>eclipse-feature</type>
+                    <id>org.eclipse.rcp</id>
+                    <versionRange>0.0.0</versionRange>
+                  </requirement>
+                  <!-- We specify our feature so that we're sure we're using 
+                    also all the required software -->
+                  <requirement>
+                    <type>eclipse-feature</type>
+                    <id>edelta.feature</id>
+                    <versionRange>0.0.0</versionRange>
+                  </requirement>
+                </extraRequirements>
+              </dependency-resolution>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>xtend-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<failIfNoTests>false</failIfNoTests>
-					<useUIHarness>true</useUIHarness>
-					<argLine>${argLine}</argLine>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.xtend</groupId>
+        <artifactId>xtend-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/edelta.parent/pom.xml b/edelta.parent/pom.xml
index eec129a89..44771a28d 100644
--- a/edelta.parent/pom.xml
+++ b/edelta.parent/pom.xml
@@ -16,6 +16,12 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
 
+    <!-- Define overridable properties for tycho-surefire-plugin -->
+    <platformSystemProperties></platformSystemProperties>
+    <moduleProperties></moduleProperties>
+    <systemProperties></systemProperties>
+    <additionalTestArgLine></additionalTestArgLine>
+
     <!-- Always refer to the corresponding tests project (if it exists) otherwise 
       Sonarqube won't be able to collect code coverage. For example, when analyzing 
       project foo it wouldn't find code coverage information if it doesn't use 
@@ -104,6 +110,18 @@
     <remote.dir>lbettini@frs.sourceforge.net:/home/frs/project/edelta</remote.dir>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.eclipse.xtext</groupId>
+        <artifactId>xtext-dev-bom</artifactId>
+        <version>${xtextVersion}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <modules>
     <module>edelta.lib</module>
     <module>edelta.testutils</module>
@@ -129,6 +147,27 @@
     edelta.library.compilation -->
 
   <profiles>
+    <profile>
+      <id>macos</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <properties>
+        <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+        <platformSystemProperties>-XstartOnFirstThread</platformSystemProperties>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk9-or-newer</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <moduleProperties>--add-modules=ALL-SYSTEM</moduleProperties>
+      </properties>
+    </profile>
     <profile>
       <id>release-composite</id>
       <activation>
@@ -461,6 +500,17 @@
             <compilerArgument>-err:-forbidden</compilerArgument>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-surefire-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+            <argLine>${additionalTestArgLine} ${platformSystemProperties} ${systemProperties} ${moduleProperties}</argLine>
+            <failIfNoTests>false</failIfNoTests>
+            <useUIHarness>false</useUIHarness>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.eluder.coveralls</groupId>
           <artifactId>coveralls-maven-plugin</artifactId>