diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index c99f3e017..d1d6a5ee5 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -66,8 +66,8 @@
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>6.1</version>
+      <artifactId>ebean-datasource-api</artifactId>
+      <version>${ebean-datasource.version}</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 91a3e6ee0..e9b82dd73 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -38,6 +38,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>junit</artifactId>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index ef9fb900c..39aac1d7f 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -146,6 +146,13 @@
 
     <!-- Test scope -->
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.nuodb.jdbc</groupId>
       <artifactId>nuodb-jdbc</artifactId>
diff --git a/ebean-ddlgen/pom.xml b/ebean-ddlgen/pom.xml
index 264ab5c1c..3ce6f1af7 100644
--- a/ebean-ddlgen/pom.xml
+++ b/ebean-ddlgen/pom.xml
@@ -35,6 +35,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index c6e157b04..b153a4290 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -49,6 +49,13 @@
     </dependency>
 
     <!-- test dependencies -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 602f92bb8..ed33ee8cd 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -65,6 +65,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index a5b51014e..81fe6df4d 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -57,6 +57,13 @@
     </dependency>
 
     <!-- test dependencies -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddlgen</artifactId>
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 76f8700f1..a7cae5521 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -34,6 +34,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 439aecee9..c9b414a92 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -12,6 +12,13 @@
   <artifactId>ebean</artifactId>
 
   <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index f72b88ea8..613c96b37 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -33,6 +33,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
diff --git a/pom.xml b/pom.xml
index c575539a5..501cf1e08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
 
   <properties>
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
+    <ebean-datasource.version>7.0</ebean-datasource.version>
   </properties>
 
   <dependencies>