diff --git a/tests/python_tests/cairo_test.py b/tests/python_tests/cairo_test.py
index 20f9f9d8b..1e8d30a59 100644
--- a/tests/python_tests/cairo_test.py
+++ b/tests/python_tests/cairo_test.py
@@ -3,7 +3,7 @@
 import os
 import mapnik
 from nose.tools import *
-from utilities import execution_path,Todo
+from utilities import execution_path
 
 def setup():
     # All of the paths used are relative, if we run the tests
diff --git a/tests/python_tests/feature_id_test.py b/tests/python_tests/feature_id_test.py
index c438f78a5..e6206bb5b 100644
--- a/tests/python_tests/feature_id_test.py
+++ b/tests/python_tests/feature_id_test.py
@@ -54,7 +54,7 @@ def test_shapefile_polygon_feature_query_id():
         compare_shape_between_mapnik_and_ogr('../data/shp/world_merc.shp',query)
 
 def test_feature_hit_count():
-    raise Todo("need to optimize multigeom bbox handling in shapeindex")
+    raise Todo("need to optimize multigeom bbox handling in shapeindex: https://github.com/mapnik/mapnik/issues/783")
     # results in different results between shp and ogr!
     #bbox = (-14284551.8434, 2074195.1992, -7474929.8687, 8140237.7628)
     bbox = (1113194.91,4512803.085,2226389.82,6739192.905)
diff --git a/tests/python_tests/feature_test.py b/tests/python_tests/feature_test.py
index f6a3dcd9e..ab6b35d1b 100644
--- a/tests/python_tests/feature_test.py
+++ b/tests/python_tests/feature_test.py
@@ -5,7 +5,6 @@ from nose.tools import *
 
 import mapnik
 from binascii import unhexlify
-from utilities import Todo
 
 class FeatureTest(unittest.TestCase):
     def makeOne(self, *args, **kw):
diff --git a/tests/python_tests/filter_test.py b/tests/python_tests/filter_test.py
index bfa7e683e..d17f43652 100644
--- a/tests/python_tests/filter_test.py
+++ b/tests/python_tests/filter_test.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 from nose.tools import *
-from utilities import Todo
-
 import mapnik
 
 if hasattr(mapnik,'Expression'):
diff --git a/tests/python_tests/speed_test.py b/tests/python_tests/image_encoding_speed_test.py
similarity index 99%
rename from tests/python_tests/speed_test.py
rename to tests/python_tests/image_encoding_speed_test.py
index 33a4c80c2..9a9c96775 100644
--- a/tests/python_tests/speed_test.py
+++ b/tests/python_tests/image_encoding_speed_test.py
@@ -6,7 +6,6 @@ import os, mapnik
 from timeit import Timer, time
 from nose.tools import *
 from utilities import execution_path
-from utilities import Todo
 
 def setup():
     # All of the paths used are relative, if we run the tests
diff --git a/tests/python_tests/introspection_test.py b/tests/python_tests/introspection_test.py
index c92a25bdd..1823944c7 100644
--- a/tests/python_tests/introspection_test.py
+++ b/tests/python_tests/introspection_test.py
@@ -3,7 +3,6 @@
 import os
 from nose.tools import *
 from utilities import execution_path
-from utilities import Todo
 
 import mapnik
 
diff --git a/tests/python_tests/memory_datasource_test.py b/tests/python_tests/memory_datasource_test.py
index 812362291..73b2575e3 100644
--- a/tests/python_tests/memory_datasource_test.py
+++ b/tests/python_tests/memory_datasource_test.py
@@ -2,8 +2,6 @@
 import itertools
 import unittest
 
-from utilities import Todo
-
 class MemoryDatasource(unittest.TestCase):
     ids = itertools.count(0)
 
diff --git a/tests/python_tests/ogr_and_shape_geometries_test.py b/tests/python_tests/ogr_and_shape_geometries_test.py
index 78f5420a9..f12bd531e 100644
--- a/tests/python_tests/ogr_and_shape_geometries_test.py
+++ b/tests/python_tests/ogr_and_shape_geometries_test.py
@@ -2,7 +2,7 @@
 
 from nose.tools import *
 
-from utilities import execution_path, Todo
+from utilities import execution_path
 
 import os, sys, glob, mapnik
 
diff --git a/tests/python_tests/render_grid_test.py b/tests/python_tests/render_grid_test.py
index 9091ee386..b490825f1 100644
--- a/tests/python_tests/render_grid_test.py
+++ b/tests/python_tests/render_grid_test.py
@@ -4,7 +4,7 @@
 from nose.tools import *
 
 import os, mapnik
-from utilities import Todo
+
 try:
     import json
 except ImportError:
diff --git a/tests/python_tests/render_test.py b/tests/python_tests/render_test.py
index 5f06162b7..d2bca07a8 100644
--- a/tests/python_tests/render_test.py
+++ b/tests/python_tests/render_test.py
@@ -6,7 +6,6 @@ import tempfile
 import os, mapnik
 from nose.tools import *
 from utilities import execution_path
-from utilities import Todo
 
 def setup():
     # All of the paths used are relative, if we run the tests