diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml b/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml
index 54e397329e..c78ef0a2ae 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml
@@ -40,9 +40,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.htmlunit</groupId>
+      <groupId>org.htmlunit</groupId>
       <artifactId>htmlunit</artifactId>
-      <version>2.3</version>
+      <version>3.8.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java b/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java
index b7891e1c93..deb88709e1 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java
@@ -22,8 +22,8 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import junit.framework.TestCase;
 
 public class BasicIT
@@ -48,7 +48,7 @@ public void tearDown()
     {
         if ( client != null )
         {
-            client.closeAllWindows();
+            client.close();
             client = null;
         }
     }
@@ -56,8 +56,8 @@ public void tearDown()
     public void testSmokes()
         throws Exception
     {
-        client.setThrowExceptionOnFailingStatusCode( false );
+        client.getOptions().setThrowExceptionOnFailingStatusCode( false );
         HtmlPage page = client.getPage( baseUrl + "index.html" );
-        assertFalse( page.asText().contains( "Hello World" ) );
+        assertFalse( page.asNormalizedText().contains( "Hello World" ) );
     }
 }
diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml b/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml
index 214a4be4ab..36e6ba798b 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml
@@ -40,9 +40,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.htmlunit</groupId>
+      <groupId>org.htmlunit</groupId>
       <artifactId>htmlunit</artifactId>
-      <version>2.3</version>
+      <version>3.8.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java b/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java
index 1c8b4ccbe8..2365a1203c 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import junit.framework.TestCase;
 
 public class BasicIT
@@ -47,7 +47,7 @@ public void tearDown()
     {
         if ( client != null )
         {
-            client.closeAllWindows();
+            client.close();
             client = null;
         }
     }
@@ -55,8 +55,8 @@ public void tearDown()
     public void testSmokes()
         throws Exception
     {
-        client.setThrowExceptionOnFailingStatusCode( false );
+        client.getOptions().setThrowExceptionOnFailingStatusCode( false );
         HtmlPage page = client.getPage( baseUrl + "index.html" );
-        assertTrue( page.asText().contains( "Hello World" ) );
+        assertTrue( page.asNormalizedText().contains( "Hello World" ) );
     }
 }
diff --git a/pom.xml b/pom.xml
index 36612f5461..5388f30fff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,9 +212,9 @@
         <version>2.9.1</version>
       </dependency>
       <dependency>
-        <groupId>net.sourceforge.htmlunit</groupId>
+        <groupId>org.htmlunit</groupId>
         <artifactId>htmlunit</artifactId>
-        <version>2.70.0</version>
+        <version>3.8.0</version>
       </dependency>
       <dependency>
         <!-- used in the unit tests and maven-shared-utils:3.3.4 -->
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index fc7c83fa87..8c720c730f 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -53,7 +53,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.htmlunit</groupId>
+      <groupId>org.htmlunit</groupId>
       <artifactId>htmlunit</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
index 139b676abf..981bfd02c4 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
@@ -21,13 +21,13 @@
 import java.io.IOException;
 import java.net.URI;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
 import org.apache.maven.surefire.its.fixture.OutputValidator;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.apache.maven.surefire.its.fixture.TestFile;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlAnchor;
+import org.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlTableRow;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;