diff --git a/tests/python_tests/query_tolerance_test.py b/tests/python_tests/query_tolerance_test.py
index 9a8c40d8a..a2ab9535c 100644
--- a/tests/python_tests/query_tolerance_test.py
+++ b/tests/python_tests/query_tolerance_test.py
@@ -14,7 +14,8 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
     def test_query_tolerance():
         srs = '+init=epsg:4326'
         lyr = mapnik.Layer('test')
-        lyr.datasource = mapnik.Shapefile(file='../data/shp/arrows.shp')
+        ds = mapnik.Shapefile(file='../data/shp/arrows.shp')
+        lyr.datasource = ds
         lyr.srs = srs
         _width = 256
         _map = mapnik.Map(_width,_width, srs)
@@ -24,16 +25,20 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
         _map_env = _map.envelope()
         tol = (_map_env.maxx - _map_env.minx) / _width * 3
         # 0.046875 for arrows.shp and zoom_all
-        assert tol == 0.046875
+        eq_(tol,0.046875)
         # check point really exists
         x, y = 2.0, 4.0
         features = _map.query_point(0,x,y).features
-        assert len(features) == 1
+        eq_(len(features),1)
         # check inside tolerance limit
         x = 2.0 + tol * 0.9
         features = _map.query_point(0,x,y).features
-        assert len(features) == 1
+        eq_(len(features),1)
         # check outside tolerance limit
         x = 2.0 + tol * 1.1
         features = _map.query_point(0,x,y).features
-        assert len(features) == 0
\ No newline at end of file
+        eq_(len(features),0)
+
+if __name__ == "__main__":
+    setup()
+    [eval(run)() for run in dir() if 'test_' in run]