diff --git a/pdfsam-gui/pom.xml b/pdfsam-gui/pom.xml
index 7598cdae..98453e57 100644
--- a/pdfsam-gui/pom.xml
+++ b/pdfsam-gui/pom.xml
@@ -26,20 +26,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>
-                        --add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-                        --add-exports javafx.base/com.sun.javafx.beans=ALL-UNNAMED
-                        --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-                        --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-                        --add-exports javafx.graphics/com.sun.glass.ui.delegate=ALL-UNNAMED
-                        --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-                    </argLine>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -196,11 +182,5 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 </project>
diff --git a/pdfsam-service/pom.xml b/pdfsam-service/pom.xml
index 1f5d2d5f..781f7620 100644
--- a/pdfsam-service/pom.xml
+++ b/pdfsam-service/pom.xml
@@ -26,17 +26,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -107,10 +96,5 @@
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.awaitility</groupId>
-			<artifactId>awaitility</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/pdfsam-test/src/main/java/org/pdfsam/test/NoWindows.java b/pdfsam-test/src/main/java/org/pdfsam/test/NoWindows.java
deleted file mode 100644
index 89e1ffdb..00000000
--- a/pdfsam-test/src/main/java/org/pdfsam/test/NoWindows.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 
- * This file is part of the PDF Split And Merge source code
- * Created on 10 dic 2018
- * Copyright 2017 by Sober Lemur S.r.l. (info@soberlemur.com).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero 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 Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.pdfsam.test;
-
-/**
- * @author Andrea Vacondio
- *
- */
-public class NoWindows {
-
-}
diff --git a/pdfsam-tools/pdfsam-alternate-mix/pom.xml b/pdfsam-tools/pdfsam-alternate-mix/pom.xml
index c636fecb..5115674b 100644
--- a/pdfsam-tools/pdfsam-alternate-mix/pom.xml
+++ b/pdfsam-tools/pdfsam-alternate-mix/pom.xml
@@ -26,18 +26,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pdfsam-tools/pdfsam-backpages/pom.xml b/pdfsam-tools/pdfsam-backpages/pom.xml
index 4a6f0006..e04e4588 100644
--- a/pdfsam-tools/pdfsam-backpages/pom.xml
+++ b/pdfsam-tools/pdfsam-backpages/pom.xml
@@ -27,18 +27,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pdfsam-tools/pdfsam-extract/pom.xml b/pdfsam-tools/pdfsam-extract/pom.xml
index c98cc46a..ccf0745b 100644
--- a/pdfsam-tools/pdfsam-extract/pom.xml
+++ b/pdfsam-tools/pdfsam-extract/pom.xml
@@ -27,18 +27,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pdfsam-tools/pdfsam-merge/pom.xml b/pdfsam-tools/pdfsam-merge/pom.xml
index 383cbb61..acc3e34f 100644
--- a/pdfsam-tools/pdfsam-merge/pom.xml
+++ b/pdfsam-tools/pdfsam-merge/pom.xml
@@ -27,18 +27,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pdfsam-tools/pdfsam-rotate/pom.xml b/pdfsam-tools/pdfsam-rotate/pom.xml
index 96889e96..a4723a1b 100644
--- a/pdfsam-tools/pdfsam-rotate/pom.xml
+++ b/pdfsam-tools/pdfsam-rotate/pom.xml
@@ -27,18 +27,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pdfsam-tools/pdfsam-simple-split/pom.xml b/pdfsam-tools/pdfsam-simple-split/pom.xml
index 87de694b..3b8f42fb 100644
--- a/pdfsam-tools/pdfsam-simple-split/pom.xml
+++ b/pdfsam-tools/pdfsam-simple-split/pom.xml
@@ -27,18 +27,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pdfsam-tools/pdfsam-split-by-bookmarks/pom.xml b/pdfsam-tools/pdfsam-split-by-bookmarks/pom.xml
index 4ded1ae1..c0c7ff81 100644
--- a/pdfsam-tools/pdfsam-split-by-bookmarks/pom.xml
+++ b/pdfsam-tools/pdfsam-split-by-bookmarks/pom.xml
@@ -27,18 +27,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pdfsam-tools/pdfsam-split-by-size/pom.xml b/pdfsam-tools/pdfsam-split-by-size/pom.xml
index 0bbc65f3..d41bacdc 100644
--- a/pdfsam-tools/pdfsam-split-by-size/pom.xml
+++ b/pdfsam-tools/pdfsam-split-by-size/pom.xml
@@ -27,18 +27,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pdfsam-ui-components/pom.xml b/pdfsam-ui-components/pom.xml
index 5ceed6c9..d195a259 100644
--- a/pdfsam-ui-components/pom.xml
+++ b/pdfsam-ui-components/pom.xml
@@ -26,20 +26,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>
-						--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-						--add-exports javafx.base/com.sun.javafx.beans=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
-						--add-exports javafx.graphics/com.sun.glass.ui.delegate=ALL-UNNAMED
-						--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-					</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pom.xml b/pom.xml
index ebd67ac9..4b5090b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,24 +47,6 @@
 				</dependency>
 			</dependencies>
 		</profile>
-		<profile>
-			<activation>
-				<os>
-					<family>Windows</family>
-				</os>
-			</activation>
-			<id>no-windows-failing-tests</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<excludedGroups>org.pdfsam.NoWindows</excludedGroups>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>toolchain</id>
 			<activation>
@@ -452,12 +434,6 @@
 				<version>${javafx.version}</version>
 				<scope>test</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.awaitility</groupId>
-				<artifactId>awaitility</artifactId>
-				<version>${awaitility.version}</version>
-				<scope>test</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
@@ -539,5 +515,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>${awaitility.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>