diff --git a/tests/python_tests/agg_rasterizer_integer_overflow_test.py b/tests/python_tests/agg_rasterizer_integer_overflow_test.py
index 1aed0b907..9b723fed4 100644
--- a/tests/python_tests/agg_rasterizer_integer_overflow_test.py
+++ b/tests/python_tests/agg_rasterizer_integer_overflow_test.py
@@ -37,4 +37,4 @@ def test_that_coordinates_do_not_overflow_and_polygon_is_rendered():
   eq_(im.get_pixel(128,128),expected_color.packed())
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/box2d_test.py b/tests/python_tests/box2d_test.py
index 4c00edd77..601b6df8c 100644
--- a/tests/python_tests/box2d_test.py
+++ b/tests/python_tests/box2d_test.py
@@ -174,4 +174,4 @@ def test_envelope_clipping():
     eq_(e1,e2)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/buffer_clear_test.py b/tests/python_tests/buffer_clear_test.py
index 7a828f8ca..495acff3b 100644
--- a/tests/python_tests/buffer_clear_test.py
+++ b/tests/python_tests/buffer_clear_test.py
@@ -60,4 +60,4 @@ if mapnik.has_grid_renderer():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
\ No newline at end of file
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/cairo_test.py b/tests/python_tests/cairo_test.py
index d35a3a5ff..7e0e8d92c 100644
--- a/tests/python_tests/cairo_test.py
+++ b/tests/python_tests/cairo_test.py
@@ -190,4 +190,4 @@ if mapnik.has_pycairo():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/compositing_test.py b/tests/python_tests/compositing_test.py
index d4d8695f1..d518de8db 100644
--- a/tests/python_tests/compositing_test.py
+++ b/tests/python_tests/compositing_test.py
@@ -259,4 +259,4 @@ def test_background_image_with_alpha_and_background_color_against_composited_con
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/datasource_test.py b/tests/python_tests/datasource_test.py
index 22436713e..c86b829bc 100644
--- a/tests/python_tests/datasource_test.py
+++ b/tests/python_tests/datasource_test.py
@@ -125,4 +125,4 @@ def test_hit_grid():
 
 if __name__ == '__main__':
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/datasource_xml_template_test.py b/tests/python_tests/datasource_xml_template_test.py
index d27f6e578..2a73bd551 100644
--- a/tests/python_tests/datasource_xml_template_test.py
+++ b/tests/python_tests/datasource_xml_template_test.py
@@ -21,4 +21,4 @@ def test_datasource_template_is_working():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/extra_map_props_test.py b/tests/python_tests/extra_map_props_test.py
index 2a5f80e17..06d659682 100644
--- a/tests/python_tests/extra_map_props_test.py
+++ b/tests/python_tests/extra_map_props_test.py
@@ -34,4 +34,4 @@ def test_serializing_arbitrary_parameters():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/feature_id_test.py b/tests/python_tests/feature_id_test.py
index 2f0856cef..cd8d85fed 100644
--- a/tests/python_tests/feature_id_test.py
+++ b/tests/python_tests/feature_id_test.py
@@ -63,4 +63,4 @@ def test_feature_hit_count():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/feature_test.py b/tests/python_tests/feature_test.py
index 45bff9825..a5e052393 100644
--- a/tests/python_tests/feature_test.py
+++ b/tests/python_tests/feature_test.py
@@ -96,4 +96,4 @@ def test_feature_expression_evaluation_attr_with_spaces():
     eq_(expr.evaluate(f),True)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/filter_test.py b/tests/python_tests/filter_test.py
index 3ad2a343e..bf80fd9fa 100644
--- a/tests/python_tests/filter_test.py
+++ b/tests/python_tests/filter_test.py
@@ -442,4 +442,4 @@ def test_division_by_zero():
     eq_(expr.evaluate(f),None)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/font_test.py b/tests/python_tests/font_test.py
index 97845e740..445c104f1 100644
--- a/tests/python_tests/font_test.py
+++ b/tests/python_tests/font_test.py
@@ -13,4 +13,4 @@ import mapnik
 #    ts = mapnik.TextSymbolizer('Name', 'Invalid Font Name', int(8), mapnik.Color('black'))
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/fontset_test.py b/tests/python_tests/fontset_test.py
index f7879955b..fcc2d50b0 100644
--- a/tests/python_tests/fontset_test.py
+++ b/tests/python_tests/fontset_test.py
@@ -39,4 +39,4 @@ def test_loading_fontset_from_python():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/geojson_plugin_test.py b/tests/python_tests/geojson_plugin_test.py
index ea5ac5457..c20174ca1 100644
--- a/tests/python_tests/geojson_plugin_test.py
+++ b/tests/python_tests/geojson_plugin_test.py
@@ -76,4 +76,4 @@ if 'geojson' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/geometry_io_test.py b/tests/python_tests/geometry_io_test.py
index d46cf1f35..ea715489d 100644
--- a/tests/python_tests/geometry_io_test.py
+++ b/tests/python_tests/geometry_io_test.py
@@ -296,4 +296,4 @@ def test_handling_geojson_null_geoms():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/grayscale_test.py b/tests/python_tests/grayscale_test.py
index 5b52f4e2e..de1fa4716 100644
--- a/tests/python_tests/grayscale_test.py
+++ b/tests/python_tests/grayscale_test.py
@@ -10,4 +10,4 @@ def test_grayscale_conversion():
     eq_((pixel >> 24) & 0xff,255);
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/image_encoding_speed_test.py b/tests/python_tests/image_encoding_speed_test.py
index 75a6d6812..51dedc44d 100644
--- a/tests/python_tests/image_encoding_speed_test.py
+++ b/tests/python_tests/image_encoding_speed_test.py
@@ -124,4 +124,4 @@ def do_encoding():
 if __name__ == "__main__":
     setup()
     do_encoding()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/image_filters_test.py b/tests/python_tests/image_filters_test.py
index 9255b0b01..c122294c9 100644
--- a/tests/python_tests/image_filters_test.py
+++ b/tests/python_tests/image_filters_test.py
@@ -65,4 +65,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/image_test.py b/tests/python_tests/image_test.py
index bad838b12..4947ce945 100644
--- a/tests/python_tests/image_test.py
+++ b/tests/python_tests/image_test.py
@@ -79,4 +79,4 @@ def test_image_open_from_string():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/introspection_test.py b/tests/python_tests/introspection_test.py
index 66665da09..59fde9248 100644
--- a/tests/python_tests/introspection_test.py
+++ b/tests/python_tests/introspection_test.py
@@ -68,4 +68,4 @@ def test_introspect_symbolizers():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/json_feature_properties_test.py b/tests/python_tests/json_feature_properties_test.py
index d2452971c..25c6a8c41 100644
--- a/tests/python_tests/json_feature_properties_test.py
+++ b/tests/python_tests/json_feature_properties_test.py
@@ -100,4 +100,4 @@ def test_char_escaping():
         eq_(pyjson['properties']['name'],expected)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/layer_buffer_size_test.py b/tests/python_tests/layer_buffer_size_test.py
index 164f6ba32..7a1d64cf8 100644
--- a/tests/python_tests/layer_buffer_size_test.py
+++ b/tests/python_tests/layer_buffer_size_test.py
@@ -32,4 +32,4 @@ if 'sqlite' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/layer_modification_test.py b/tests/python_tests/layer_modification_test.py
index ec13fc7ed..2903143e4 100644
--- a/tests/python_tests/layer_modification_test.py
+++ b/tests/python_tests/layer_modification_test.py
@@ -72,4 +72,4 @@ def test_adding_datasource_to_layer():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/layer_test.py b/tests/python_tests/layer_test.py
index 1a779aa28..1a11c0fc5 100644
--- a/tests/python_tests/layer_test.py
+++ b/tests/python_tests/layer_test.py
@@ -25,4 +25,4 @@ def test_layer_init():
     eq_(len(l.styles),0)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/load_map_test.py b/tests/python_tests/load_map_test.py
index 75d6112a5..fcf128c27 100644
--- a/tests/python_tests/load_map_test.py
+++ b/tests/python_tests/load_map_test.py
@@ -57,4 +57,4 @@ def test_good_files():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/map_query_test.py b/tests/python_tests/map_query_test.py
index f1493a6e3..e01407e60 100644
--- a/tests/python_tests/map_query_test.py
+++ b/tests/python_tests/map_query_test.py
@@ -101,4 +101,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/mapnik_config_test.py b/tests/python_tests/mapnik_config_test.py
index 8608299d7..395cbdb61 100644
--- a/tests/python_tests/mapnik_config_test.py
+++ b/tests/python_tests/mapnik_config_test.py
@@ -77,4 +77,4 @@ def test_mapnik_config_valid_and_invalid_option():
     eq_(process.returncode,0)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/mapnik_logger_test.py b/tests/python_tests/mapnik_logger_test.py
index 0bfbf453f..da338ee5b 100644
--- a/tests/python_tests/mapnik_logger_test.py
+++ b/tests/python_tests/mapnik_logger_test.py
@@ -15,4 +15,4 @@ def test_logger_init():
     eq_(mapnik.logger.get_severity(),default)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/markers_complex_rendering_test.py b/tests/python_tests/markers_complex_rendering_test.py
index c8e6c827d..029f55929 100644
--- a/tests/python_tests/markers_complex_rendering_test.py
+++ b/tests/python_tests/markers_complex_rendering_test.py
@@ -37,4 +37,4 @@ if 'csv' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/memory_datasource_test.py b/tests/python_tests/memory_datasource_test.py
index 9ba317325..c2791bf3c 100644
--- a/tests/python_tests/memory_datasource_test.py
+++ b/tests/python_tests/memory_datasource_test.py
@@ -31,4 +31,4 @@ def test_add_feature():
     eq_(len(retrieved), 0)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/multi_tile_raster_test.py b/tests/python_tests/multi_tile_raster_test.py
index ad15db7da..5ecb46e39 100644
--- a/tests/python_tests/multi_tile_raster_test.py
+++ b/tests/python_tests/multi_tile_raster_test.py
@@ -65,4 +65,4 @@ def test_multi_tile_policy():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/ogr_and_shape_geometries_test.py b/tests/python_tests/ogr_and_shape_geometries_test.py
index dd05add42..e1880d704 100644
--- a/tests/python_tests/ogr_and_shape_geometries_test.py
+++ b/tests/python_tests/ogr_and_shape_geometries_test.py
@@ -41,4 +41,4 @@ if 'shape' in plugins and 'ogr' in plugins:
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/ogr_test.py b/tests/python_tests/ogr_test.py
index 4b29d5570..cf6a9f0c3 100644
--- a/tests/python_tests/ogr_test.py
+++ b/tests/python_tests/ogr_test.py
@@ -62,4 +62,4 @@ if 'ogr' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/osm_test.py b/tests/python_tests/osm_test.py
index c92b0f181..c962cc3dc 100644
--- a/tests/python_tests/osm_test.py
+++ b/tests/python_tests/osm_test.py
@@ -49,4 +49,4 @@ if 'osm' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/palette_test.py b/tests/python_tests/palette_test.py
index e7d3eff86..9c8576f8e 100644
--- a/tests/python_tests/palette_test.py
+++ b/tests/python_tests/palette_test.py
@@ -47,4 +47,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/parameters_test.py b/tests/python_tests/parameters_test.py
index 846ef31dc..150fdb85f 100644
--- a/tests/python_tests/parameters_test.py
+++ b/tests/python_tests/parameters_test.py
@@ -58,4 +58,4 @@ def test_parameters():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/pickling_test.py b/tests/python_tests/pickling_test.py
index 264ade67d..772c27496 100644
--- a/tests/python_tests/pickling_test.py
+++ b/tests/python_tests/pickling_test.py
@@ -42,4 +42,4 @@ def test_parameters_pickle():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/png_encoding_test.py b/tests/python_tests/png_encoding_test.py
index 94f0559bf..d335bba40 100644
--- a/tests/python_tests/png_encoding_test.py
+++ b/tests/python_tests/png_encoding_test.py
@@ -161,4 +161,4 @@ if mapnik.has_png():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
\ No newline at end of file
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/pngsuite_test.py b/tests/python_tests/pngsuite_test.py
index 86ae7f61d..26c2456da 100644
--- a/tests/python_tests/pngsuite_test.py
+++ b/tests/python_tests/pngsuite_test.py
@@ -32,4 +32,4 @@ def test_broken_pngs():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/postgis_test.py b/tests/python_tests/postgis_test.py
index 2e3a10782..da80be33b 100644
--- a/tests/python_tests/postgis_test.py
+++ b/tests/python_tests/postgis_test.py
@@ -1016,4 +1016,4 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/projection_test.py b/tests/python_tests/projection_test.py
index 41df057b8..e45b37da4 100644
--- a/tests/python_tests/projection_test.py
+++ b/tests/python_tests/projection_test.py
@@ -115,4 +115,4 @@ def test_proj_transform_between_init_and_literal():
 
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/query_test.py b/tests/python_tests/query_test.py
index 074614a31..6138f6e28 100644
--- a/tests/python_tests/query_test.py
+++ b/tests/python_tests/query_test.py
@@ -34,4 +34,4 @@ def test_query_resolution():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/query_tolerance_test.py b/tests/python_tests/query_tolerance_test.py
index 092f0f3e0..420d1806d 100644
--- a/tests/python_tests/query_tolerance_test.py
+++ b/tests/python_tests/query_tolerance_test.py
@@ -40,4 +40,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/raster_colorizer_test.py b/tests/python_tests/raster_colorizer_test.py
index 9b8778d3f..e0284d299 100644
--- a/tests/python_tests/raster_colorizer_test.py
+++ b/tests/python_tests/raster_colorizer_test.py
@@ -87,4 +87,4 @@ def test_stop_label():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/raster_symbolizer_test.py b/tests/python_tests/raster_symbolizer_test.py
index 74ec4d990..0c1900d5f 100644
--- a/tests/python_tests/raster_symbolizer_test.py
+++ b/tests/python_tests/raster_symbolizer_test.py
@@ -195,4 +195,4 @@ def test_raster_warping_does_not_overclip_source():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/render_grid_test.py b/tests/python_tests/render_grid_test.py
index ca0996707..df7189ad1 100644
--- a/tests/python_tests/render_grid_test.py
+++ b/tests/python_tests/render_grid_test.py
@@ -383,4 +383,4 @@ if mapnik.has_grid_renderer():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/render_test.py b/tests/python_tests/render_test.py
index fa4fd4c3e..e1d319ea3 100644
--- a/tests/python_tests/render_test.py
+++ b/tests/python_tests/render_test.py
@@ -237,4 +237,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/reprojection_test.py b/tests/python_tests/reprojection_test.py
index 371ed217e..48632980e 100644
--- a/tests/python_tests/reprojection_test.py
+++ b/tests/python_tests/reprojection_test.py
@@ -89,4 +89,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/save_map_test.py b/tests/python_tests/save_map_test.py
index 0698c3a3d..739fc5c54 100644
--- a/tests/python_tests/save_map_test.py
+++ b/tests/python_tests/save_map_test.py
@@ -63,4 +63,4 @@ def test_compare_map():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/shapefile_test.py b/tests/python_tests/shapefile_test.py
index 661092d6d..b12a143a4 100644
--- a/tests/python_tests/shapefile_test.py
+++ b/tests/python_tests/shapefile_test.py
@@ -110,4 +110,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/sqlite_rtree_test.py b/tests/python_tests/sqlite_rtree_test.py
index 3ecba78e0..ebb7661e6 100644
--- a/tests/python_tests/sqlite_rtree_test.py
+++ b/tests/python_tests/sqlite_rtree_test.py
@@ -156,4 +156,4 @@ if 'sqlite' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/sqlite_test.py b/tests/python_tests/sqlite_test.py
index 53edfe496..f384fccae 100644
--- a/tests/python_tests/sqlite_test.py
+++ b/tests/python_tests/sqlite_test.py
@@ -418,4 +418,4 @@ if 'sqlite' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/style_test.py b/tests/python_tests/style_test.py
index ac7772b1d..9b06273a3 100644
--- a/tests/python_tests/style_test.py
+++ b/tests/python_tests/style_test.py
@@ -16,4 +16,4 @@ def test_style_init():
    eq_(s.image_filters_inflate,False)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
diff --git a/tests/python_tests/webp_encoding_test.py b/tests/python_tests/webp_encoding_test.py
index ed6e57745..d01459436 100644
--- a/tests/python_tests/webp_encoding_test.py
+++ b/tests/python_tests/webp_encoding_test.py
@@ -159,4 +159,4 @@ if mapnik.has_webp():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
\ No newline at end of file
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))