diff --git a/build.gradle b/build.gradle
index cfde803..0531fca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,14 +34,14 @@ version = jqwikVavrVersion
 description = "Jqwik Vavr support module"
 
 dependencies {
-    api("net.jqwik:jqwik:${jqwikVersion}")
+    api("net.jqwik:jqwik-api:${jqwikVersion}")
 
-    implementation("net.jqwik:jqwik-engine:${jqwikVersion}")
     implementation("io.vavr:vavr:${vavrVersion}")
 
     testImplementation("org.hamcrest:hamcrest:${hamcrestVersion}")
+    testRuntimeOnly("net.jqwik:jqwik-engine:${jqwikVersion}")
 
-    // Only needed to work around intelliJ bug with running tests in package
+    // Only needed to work around intelliJ bug with running all tests in package
     testImplementation("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
 }
 
diff --git a/pom.xml b/pom.xml
index 38d59cf..f3b1276 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,17 +64,18 @@
 
         <dependency>
             <groupId>net.jqwik</groupId>
-            <artifactId>jqwik</artifactId>
+            <artifactId>jqwik-api</artifactId>
             <version>${jqwik.version}</version>
         </dependency>
+
+        <!-- Test -->
         <dependency>
             <groupId>net.jqwik</groupId>
             <artifactId>jqwik-engine</artifactId>
             <version>${jqwik.version}</version>
-            <scope>compile</scope>
+            <scope>test</scope>
         </dependency>
 
-        <!-- Test -->
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
diff --git a/src/main/java/net/jqwik/vavr/arbitraries/base/MapBasedArbitrary.java b/src/main/java/net/jqwik/vavr/arbitraries/base/MapBasedArbitrary.java
index ccb592b..7f4c335 100644
--- a/src/main/java/net/jqwik/vavr/arbitraries/base/MapBasedArbitrary.java
+++ b/src/main/java/net/jqwik/vavr/arbitraries/base/MapBasedArbitrary.java
@@ -12,8 +12,6 @@
 import java.util.function.Function;
 
 /**
- * @see net.jqwik.engine.properties.arbitraries.DefaultMapArbitrary
- *
  * @param <K> Key type
  * @param <V> Value type
  * @param <U> Map type
diff --git a/src/main/java/net/jqwik/vavr/providers/base/AbstractDoubleTypeArbitraryProvider.java b/src/main/java/net/jqwik/vavr/providers/base/AbstractDoubleTypeArbitraryProvider.java
index 01bf231..3cde616 100644
--- a/src/main/java/net/jqwik/vavr/providers/base/AbstractDoubleTypeArbitraryProvider.java
+++ b/src/main/java/net/jqwik/vavr/providers/base/AbstractDoubleTypeArbitraryProvider.java
@@ -2,13 +2,12 @@
 
 import net.jqwik.api.Arbitrary;
 import net.jqwik.api.providers.TypeUsage;
-import net.jqwik.engine.providers.HashMapArbitraryProvider;
 
 import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
- * @see HashMapArbitraryProvider
+ * @see net.jqwik.engine.providers.HashMapArbitraryProvider
  *
  * @author Benno Müller
  */