diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 26ac20f9d..fa732d60e 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -14,7 +14,7 @@
   <artifactId>ebean-postgis</artifactId>
 
   <properties>
-    <postgis.jdbc.version>2.2.1</postgis.jdbc.version>
+    <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
   </properties>
 
   <dependencies>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>net.postgis</groupId>
       <artifactId>postgis-jdbc</artifactId>
-      <version>[${postgis.jdbc.version}]</version>
+      <version>${postgis.jdbc.version}</version>
     </dependency>
 
     <!-- expected to be provided -->
@@ -64,13 +64,6 @@
       <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-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
index 2b8463d0b..27bf5200b 100644
--- a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
+++ b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
@@ -7,8 +7,10 @@ import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarType;
 import org.postgis.Geometry;
+import org.postgis.GeometryBuilder;
 import org.postgis.PGgeometry;
 import org.postgis.PGgeometryLW;
+import org.postgis.binary.BinaryParser;
 import org.postgresql.util.PGobject;
 
 import java.io.DataInput;
@@ -51,7 +53,7 @@ abstract class ScalarTypePgisBase<T extends Geometry> implements ScalarType<T> {
       return (T) ((PGgeometry) object).getGeometry();
 
     } else if (object instanceof PGobject) {
-      return (T) PGgeometry.geomFromString(((PGobject) object).getValue());
+      return (T) GeometryBuilder.geomFromString(((PGobject) object).getValue(), new BinaryParser(), false);
 
     } else {
       throw new IllegalStateException("Could not convert from " + object.getClass() + " to " + cls);