diff --git a/tests/python_tests/feature_test.py b/tests/python_tests/feature_test.py
index e34b1051f..e690c419b 100644
--- a/tests/python_tests/feature_test.py
+++ b/tests/python_tests/feature_test.py
@@ -14,14 +14,10 @@ class FeatureTest(unittest.TestCase):
         self.failUnless(f is not None)
 
     def test_python_extended_constructor(self):
-        try:
-            from shapely.geometry import Point
-        except ImportError:
-            raise Todo("Make this test not dependant on shapely")
-
-        f = self.makeOne(1, Point(3,6), foo="bar")
+        from mapnik2 import Geometry2d
+        f = self.makeOne(1, Geometry2d.from_wkt('Point(3 6)'), foo="bar")
         self.failUnlessEqual(f['foo'], 'bar')
-        env = f.geometry.envelope()
+        env = f.get_geometry(0).envelope()
         self.failUnlessEqual(env.minx, 3)
         self.failUnlessEqual(env.miny, 6)
 
@@ -40,22 +36,17 @@ class FeatureTest(unittest.TestCase):
 
 
     def test_add_wkb_geometry(self):
-        try:
-            from shapely.geometry import Point
-        except ImportError:
-            raise Todo("Make this test not dependant on shapely")
+        from mapnik2 import Geometry2d
 
         def add_it(geometry):
             f = self.makeOne(1)
             self.failUnlessEqual(len(f.geometries), 0)
             f.add_geometry(geometry)
             self.failUnlessEqual(len(f.geometries), 1)
-            env = f.geometry.envelope()
+            env = f.get_geometry(0).envelope()
             self.failUnlessEqual(env.minx, 3)
             self.failUnlessEqual(env.minx, env.maxx)
             self.failUnlessEqual(env.miny, 6)
             self.failUnlessEqual(env.miny, env.maxy)
-
-        geometries = (Point(3,6), 'POINT(3 6)', Point(3,6).wkb)
-        for geom in geometries:
-            add_it(geom)
+        
+        add_it(Geometry2d.from_wkt('Point(3 6)'))
diff --git a/tests/python_tests/memory_datasource_test.py b/tests/python_tests/memory_datasource_test.py
index 4dd872115..339b103a3 100644
--- a/tests/python_tests/memory_datasource_test.py
+++ b/tests/python_tests/memory_datasource_test.py
@@ -14,7 +14,7 @@ class MemoryDatasource(unittest.TestCase):
     def makeFeature(self, geom, **properties):
         from mapnik2 import Feature
         f = Feature(self.ids.next())
-        f.add_geometry(geom.wkb)
+        f.add_geometry(geom)
         for k,v in properties.iteritems():
             f[k] = v
         return f
@@ -24,14 +24,10 @@ class MemoryDatasource(unittest.TestCase):
         self.failUnless(f is not None)
 
     def test_add_feature(self):
-        try:
-            from shapely.geometry import Point
-        except ImportError:
-            raise Todo("Make this test not dependant on shapely")
-
         md = self.makeOne()
         self.failUnlessEqual(md.num_features(), 0)
-        md.add_feature(self.makeFeature(Point(2,3), foo='bar'))
+        from mapnik2 import Geometry2d
+        md.add_feature(self.makeFeature(Geometry2d.from_wkt('Point(2 3)'), foo='bar'))
         self.failUnlessEqual(md.num_features(), 1)
 
         from mapnik2 import Coord