diff --git a/IPython/nbconvert/exporters/tests/test_basichtml.py b/IPython/nbconvert/exporters/tests/test_basichtml.py
index 2c8ce64..c7215e5 100644
--- a/IPython/nbconvert/exporters/tests/test_basichtml.py
+++ b/IPython/nbconvert/exporters/tests/test_basichtml.py
@@ -21,7 +21,7 @@ from ..basichtml import BasicHTMLExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_BasicHTMLExporter(ExportersTestsBase):
+class TestBasicHTMLExporter(ExportersTestsBase):
     """Contains test functions for basichtml.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/exporters/tests/test_export.py b/IPython/nbconvert/exporters/tests/test_export.py
index 4a03d74..96e02fa 100644
--- a/IPython/nbconvert/exporters/tests/test_export.py
+++ b/IPython/nbconvert/exporters/tests/test_export.py
@@ -26,7 +26,7 @@ from ..python import PythonExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_Export(ExportersTestsBase):
+class TestExport(ExportersTestsBase):
     """Contains test functions for export.py"""
 
 
diff --git a/IPython/nbconvert/exporters/tests/test_exporter.py b/IPython/nbconvert/exporters/tests/test_exporter.py
index 6e45762..66f7e1f 100644
--- a/IPython/nbconvert/exporters/tests/test_exporter.py
+++ b/IPython/nbconvert/exporters/tests/test_exporter.py
@@ -25,7 +25,7 @@ from ..exporter import Exporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_Exporter(ExportersTestsBase):
+class TestExporter(ExportersTestsBase):
     """Contains test functions for exporter.py"""
 
 
diff --git a/IPython/nbconvert/exporters/tests/test_fullhtml.py b/IPython/nbconvert/exporters/tests/test_fullhtml.py
index 01b77c0..6342198 100644
--- a/IPython/nbconvert/exporters/tests/test_fullhtml.py
+++ b/IPython/nbconvert/exporters/tests/test_fullhtml.py
@@ -21,7 +21,7 @@ from ..fullhtml import FullHTMLExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_FullHTMLExporter(ExportersTestsBase):
+class TestFullHTMLExporter(ExportersTestsBase):
     """Contains test functions for fullhtml.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/exporters/tests/test_latex.py b/IPython/nbconvert/exporters/tests/test_latex.py
index 882bf6f..52b3726 100644
--- a/IPython/nbconvert/exporters/tests/test_latex.py
+++ b/IPython/nbconvert/exporters/tests/test_latex.py
@@ -21,7 +21,7 @@ from ..latex import LatexExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_LatexExporter(ExportersTestsBase):
+class TestLatexExporter(ExportersTestsBase):
     """Contains test functions for latex.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/exporters/tests/test_markdown.py b/IPython/nbconvert/exporters/tests/test_markdown.py
index 1735324..53a8126 100644
--- a/IPython/nbconvert/exporters/tests/test_markdown.py
+++ b/IPython/nbconvert/exporters/tests/test_markdown.py
@@ -21,7 +21,7 @@ from ..markdown import MarkdownExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_MarkdownExporter(ExportersTestsBase):
+class TestMarkdownExporter(ExportersTestsBase):
     """Contains test functions for markdown.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/exporters/tests/test_python.py b/IPython/nbconvert/exporters/tests/test_python.py
index 2fc1209..3fc4cf6 100644
--- a/IPython/nbconvert/exporters/tests/test_python.py
+++ b/IPython/nbconvert/exporters/tests/test_python.py
@@ -21,7 +21,7 @@ from ..python import PythonExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_PythonExporter(ExportersTestsBase):
+class TestPythonExporter(ExportersTestsBase):
     """Contains test functions for python.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/exporters/tests/test_reveal.py b/IPython/nbconvert/exporters/tests/test_reveal.py
index 9adf45d..daa40c8 100644
--- a/IPython/nbconvert/exporters/tests/test_reveal.py
+++ b/IPython/nbconvert/exporters/tests/test_reveal.py
@@ -21,7 +21,7 @@ from ..reveal import RevealExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_RevealExporter(ExportersTestsBase):
+class TestRevealExporter(ExportersTestsBase):
     """Contains test functions for reveal.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/exporters/tests/test_rst.py b/IPython/nbconvert/exporters/tests/test_rst.py
index 034f73c..82e6f64 100644
--- a/IPython/nbconvert/exporters/tests/test_rst.py
+++ b/IPython/nbconvert/exporters/tests/test_rst.py
@@ -21,7 +21,7 @@ from ..rst import RSTExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_RstExporter(ExportersTestsBase):
+class TestRSTExporter(ExportersTestsBase):
     """Contains test functions for rst.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/exporters/tests/test_sphinx_howto.py b/IPython/nbconvert/exporters/tests/test_sphinx_howto.py
index 9444c7c..0f617bf 100644
--- a/IPython/nbconvert/exporters/tests/test_sphinx_howto.py
+++ b/IPython/nbconvert/exporters/tests/test_sphinx_howto.py
@@ -21,7 +21,7 @@ from ..sphinx_howto import SphinxHowtoExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_SphinxHowtoExporter(ExportersTestsBase):
+class TestSphinxHowtoExporter(ExportersTestsBase):
     """Contains test functions for sphinx_howto.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/exporters/tests/test_sphinx_manual.py b/IPython/nbconvert/exporters/tests/test_sphinx_manual.py
index 995856e..dbc9475 100644
--- a/IPython/nbconvert/exporters/tests/test_sphinx_manual.py
+++ b/IPython/nbconvert/exporters/tests/test_sphinx_manual.py
@@ -21,7 +21,7 @@ from ..sphinx_manual import SphinxManualExporter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_SphinxManualExporter(ExportersTestsBase):
+class TestSphinxManualExporter(ExportersTestsBase):
     """Contains test functions for sphinx_manual.py"""
 
     def test_constructor(self):
diff --git a/IPython/nbconvert/filters/tests/test_ansi.py b/IPython/nbconvert/filters/tests/test_ansi.py
index e780ea4..55fc192 100644
--- a/IPython/nbconvert/filters/tests/test_ansi.py
+++ b/IPython/nbconvert/filters/tests/test_ansi.py
@@ -24,7 +24,7 @@ from ..ansi import *
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_Ansi(TestsBase):
+class TestAnsi(TestsBase):
     """Contains test functions for ansi.py"""
 
 
diff --git a/IPython/nbconvert/filters/tests/test_datatypefilter.py b/IPython/nbconvert/filters/tests/test_datatypefilter.py
index 0c311b1..621cbb2 100644
--- a/IPython/nbconvert/filters/tests/test_datatypefilter.py
+++ b/IPython/nbconvert/filters/tests/test_datatypefilter.py
@@ -23,7 +23,7 @@ from ..datatypefilter import DataTypeFilter
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_DataTypeFilter(TestsBase):
+class TestDataTypeFilter(TestsBase):
     """Contains test functions for datatypefilter.py"""
 
 
diff --git a/IPython/nbconvert/filters/tests/test_highlight.py b/IPython/nbconvert/filters/tests/test_highlight.py
index 2ea4080..61a7076 100644
--- a/IPython/nbconvert/filters/tests/test_highlight.py
+++ b/IPython/nbconvert/filters/tests/test_highlight.py
@@ -23,7 +23,7 @@ from ..highlight import *
 # Class
 #-----------------------------------------------------------------------------
 
-class Test_Highlight(TestsBase):
+class TestHighlight(TestsBase):
     """Contains test functions for highlight.py"""
 
 
diff --git a/IPython/nbconvert/tests/test_nbconvertapp.py b/IPython/nbconvert/tests/test_nbconvertapp.py
index 7c03316..0b428db 100644
--- a/IPython/nbconvert/tests/test_nbconvertapp.py
+++ b/IPython/nbconvert/tests/test_nbconvertapp.py
@@ -20,7 +20,7 @@ from .base import TestsBase
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-class Test_NbConvertApp(TestsBase):
+class TestNbConvertApp(TestsBase):
     """Collection of NbConvertApp tests"""