diff --git a/driver-core/src/test/java/com/datastax/driver/core/TestListener.java b/driver-core/src/test/java/com/datastax/driver/core/TestListener.java
index 2e8a8b8acf3..5c440a001f0 100644
--- a/driver-core/src/test/java/com/datastax/driver/core/TestListener.java
+++ b/driver-core/src/test/java/com/datastax/driver/core/TestListener.java
@@ -45,6 +45,12 @@ public class TestListener extends TestListenerAdapter implements IInvokedMethodL
 
   @Override
   public void onTestFailure(ITestResult tr) {
+    if (tr.getThrowable() instanceof SkipException) {
+      // Workaround for testng 6.13.x bug https://github.com/testng-team/testng/issues/1632
+      // When SkipException thrown from beforeInvocation marks test as FAILED
+      tr.setStatus(ITestResult.SKIP);
+      return;
+    }
     long elapsedTime = TimeUnit.NANOSECONDS.toSeconds((System.nanoTime() - start_time));
     long testTime = tr.getEndMillis() - tr.getStartMillis();
     tr.getThrowable().printStackTrace();
diff --git a/pom.xml b/pom.xml
index fc480fcca3c..0a00697c5a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
         <!-- more recent versions of pax-exam require JDK7+ -->
         <pax-exam.version>3.6.0</pax-exam.version>
         <url.version>2.4.0</url.version>
-        <testng.version>6.8.8</testng.version>
+        <testng.version>6.14.3</testng.version>
         <assertj.version>1.7.1</assertj.version>
         <mockito.version>1.10.19</mockito.version>
         <wiremock.version>2.27.2</wiremock.version>