diff --git a/chaco/shell/tests/test_tutorial_example.py b/chaco/shell/tests/test_tutorial_example.py
index 6aff86283..19f4c864c 100644
--- a/chaco/shell/tests/test_tutorial_example.py
+++ b/chaco/shell/tests/test_tutorial_example.py
@@ -21,6 +21,3 @@ def test_script(self):
         plot(x, y, "r-")
         title("First plot")
         ytitle("sin(x)")
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/chaco/tests/test_border.py b/chaco/tests/test_border.py
index a9ce4a6a6..460b546ef 100644
--- a/chaco/tests/test_border.py
+++ b/chaco/tests/test_border.py
@@ -35,7 +35,3 @@ def test_draw_border_simple(self):
 
         actual = gc.bmp_array[:,:,0]
         self.assertRavelEqual(actual, desired)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/chaco/tests/test_cmap_image_plot.py b/chaco/tests/test_cmap_image_plot.py
index 1b2843ddc..25681dea4 100644
--- a/chaco/tests/test_cmap_image_plot.py
+++ b/chaco/tests/test_cmap_image_plot.py
@@ -40,6 +40,3 @@ def test_redraw_on_color_mapper_update(self):
 
         # Then
         window.redraw.assert_called_once_with()
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/chaco/tests/test_colormapped_scatterplot.py b/chaco/tests/test_colormapped_scatterplot.py
index e00982728..2618cf0e4 100644
--- a/chaco/tests/test_colormapped_scatterplot.py
+++ b/chaco/tests/test_colormapped_scatterplot.py
@@ -81,7 +81,3 @@ def test_colormap_updated(self):
         """ If colormapper updated then we need to redraw """
         self.color_mapper.updated = True
         self.assertFalse(self.scatterplot.draw_valid)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/chaco/tests/test_data_label.py b/chaco/tests/test_data_label.py
index 647fb2541..08a4c3728 100644
--- a/chaco/tests/test_data_label.py
+++ b/chaco/tests/test_data_label.py
@@ -26,7 +26,3 @@ def test_data_label_arrow_not_visible(self):
         plot.outer_bounds = list(size)
         gc = PlotGraphicsContext(size)
         gc.render_component(plot)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/chaco/tests/test_plot.py b/chaco/tests/test_plot.py
index d2d155991..a9c182b6b 100644
--- a/chaco/tests/test_plot.py
+++ b/chaco/tests/test_plot.py
@@ -90,7 +90,3 @@ def test_text_plot(self):
         gc.render_component(plot)
         actual = gc.bmp_array[:, :, :]
         self.assertFalse(alltrue(actual == 255))
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/chaco/tests/test_scatterplot_renderers.py b/chaco/tests/test_scatterplot_renderers.py
index e9aa23728..cc2e2fe1f 100644
--- a/chaco/tests/test_scatterplot_renderers.py
+++ b/chaco/tests/test_scatterplot_renderers.py
@@ -72,7 +72,3 @@ def test_scatter_slow(self):
         gc.render_component(scatterplot)
         actual = gc.bmp_array[:, :, :]
         self.assertFalse(alltrue(actual == 255))
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/chaco/tests/test_ticks.py b/chaco/tests/test_ticks.py
index 921a087b9..f72141d0e 100644
--- a/chaco/tests/test_ticks.py
+++ b/chaco/tests/test_ticks.py
@@ -108,7 +108,3 @@ def test_auto_interval_max_ticks(self):
             num_ticks = int((data_high - data_low) / interval)
             self.assertGreaterEqual(num_ticks, 3)
             self.assertLessEqual(num_ticks, max_ticks)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/chaco/tools/tests/test_range_zoom.py b/chaco/tools/tests/test_range_zoom.py
index de6d35395..518cd4755 100644
--- a/chaco/tools/tests/test_range_zoom.py
+++ b/chaco/tools/tests/test_range_zoom.py
@@ -64,8 +64,3 @@ def test_rgba_background_range(self):
 
         self.assertEqual(gc.set_fill_color.call_args,
                          mock.call([1.0, 0.0, 0.0, 0.3]))
-
-
-if __name__ == '__main__':
-    from unittest import main
-    main()