diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 212f9019c0..21ade225c0 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -222,8 +222,6 @@ test.dependsOn ':hibernate-orm-modules:prepareWildFlyForTests'
 
 test {
     systemProperty 'file.encoding', 'utf-8'
-    //Set the port-offset to match the offset in arquillian.xml
-    systemProperty 'jboss.socket.binding.port-offset', '137'
     beforeTest { descriptor ->
         //println "Starting test: " + descriptor
     }
diff --git a/hibernate-core/src/test/resources/arquillian.xml b/hibernate-core/src/test/resources/arquillian.xml
index eeb46e2989..923d29f3dc 100644
--- a/hibernate-core/src/test/resources/arquillian.xml
+++ b/hibernate-core/src/test/resources/arquillian.xml
@@ -26,12 +26,10 @@
                 <!-- For Remote debugging of Wildfly add the following line to the 'javaVmArguments' section below: -->
                 <!-- -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y-->
                 <!-- DO NOT add comments within the property section below as the Arquillian parser can't deal with it -->
-                <!-- The port offset is defined to avoid classhing with NVidia drivers on Windows -->
                 <property name="javaVmArguments">
                     -Dee8.preview.mode=true
                     -Djava.net.preferIPv4Stack=true
                     -Djgroups.bind_addr=127.0.0.1
-                    -Djboss.socket.binding.port-offset=137
                 </property>
             </configuration>
         </container>
diff --git a/hibernate-orm-modules/hibernate-orm-modules.gradle b/hibernate-orm-modules/hibernate-orm-modules.gradle
index 3bb45c6b29..4f38deefb5 100644
--- a/hibernate-orm-modules/hibernate-orm-modules.gradle
+++ b/hibernate-orm-modules/hibernate-orm-modules.gradle
@@ -156,7 +156,3 @@ processTestResources {
 	)
 }
 
-test {
-	//Set the port-offset to match the offset in arquillian.xml
-	systemProperties['jboss.socket.binding.port-offset'] = 137
-}
diff --git a/hibernate-orm-modules/src/test/resources/arquillian.xml b/hibernate-orm-modules/src/test/resources/arquillian.xml
index 1a307beb3f..29026d4096 100644
--- a/hibernate-orm-modules/src/test/resources/arquillian.xml
+++ b/hibernate-orm-modules/src/test/resources/arquillian.xml
@@ -26,12 +26,10 @@
                 <!-- For Remote debugging of Wildfly add the following line to the 'javaVmArguments' section below: -->
                 <!-- -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y-->
                 <!-- DO NOT add comments within the property section below as the Arquillian parser can't deal with it -->
-                <!-- The port offset is defined to avoid classhing with NVidia drivers on Windows -->
                 <property name="javaVmArguments">
                     -Dee8.preview.mode=true
                     -Djava.net.preferIPv4Stack=true
                     -Djgroups.bind_addr=127.0.0.1
-                    -Djboss.socket.binding.port-offset=137
                 </property>
             </configuration>
         </container>