diff --git a/tests/test_simple.py b/tests/test_simple.py
index e5befc2..dd76804 100644
--- a/tests/test_simple.py
+++ b/tests/test_simple.py
@@ -3,69 +3,80 @@ import nose.tools as nt
 
 import os
 import glob
+import tempfile
+import shutil
 from IPython.nbformat import current as nbformat
 
-fname = 'tests/test.ipynb'
-out_fname = 'tests/test.rst'
 
+class TestSimple(object):
+    def setUp(self):
+        """
+        Create a new temporary directory and copy the input file
+        'test.ipynb' there.
+        """
+        self.fname = 'test.ipynb'
+        self.basename = os.path.splitext(self.fname)[0]
+        self.wrkdir = tempfile.mkdtemp()
+        self.infile = os.path.join(self.wrkdir, self.fname)
+        shutil.copy(os.path.join('tests', self.fname), self.infile)
 
-def clean_dir():
-    "Remove .rst files created during conversion"
-    map(os.remove, glob.glob("./tests/*.rst"))
-    map(os.remove, glob.glob("./tests/*.png"))
-    map(os.remove, glob.glob("./tests/*.html"))
-    map(os.remove, glob.glob("./tests/test_files/*"))
+    def tearDown(self):
+        shutil.rmtree(self.wrkdir)
 
+    def outfile_exists(self, fmt):
+        return os.path.exists(os.path.join(self.wrkdir,
+                                           self.basename + '.' + fmt))
 
-@nt.with_setup(clean_dir, clean_dir)
-def test_simple():
-    c = ConverterRST(fname)
-    f = c.render()
-    nt.assert_true(f.endswith('.rst'), 'changed file extension to rst')
+    def test_simple(self):
+        c = ConverterRST(self.infile)
+        f = c.render()
+        nt.assert_true(f.endswith('.rst'), 'changed file extension to rst')
 
+    def test_main(self):
+        """
+        Test main entry point
+        """
+        main(self.infile)
+        nt.assert_true(self.outfile_exists('rst'))
 
-@nt.with_setup(clean_dir, clean_dir)
-def test_main():
-    """
-    Test main entry point
-    """
-    main(fname)
-    nt.assert_true(os.path.exists(out_fname))
+    def test_render_heading(self):
+        """
+        Unit test for cell type "heading"
+        """
+        # Generate and test heading cells level 1-6
+        for level in xrange(1, 7):
+            cell = {
+                'cell_type': 'heading',
+                'level': level,
+                'source':  ['Test for heading type H{0}'.format(level)]
+                }
 
+            # Convert cell dictionaries to NotebookNode
+            cell_nb = nbformat.NotebookNode(cell)
 
-def test_render_heading():
-    """ Unit test for cell type "heading" """
-    # Generate and test heading cells level 1-6
-    for level in xrange(1, 7):
-        cell = {
-            'cell_type': 'heading',
-            'level': level,
-            'source':  ['Test for heading type H{0}'.format(level)]
-            }
-        # Convert cell dictionaries to NotebookNode
-        cell_nb = nbformat.NotebookNode(cell)
-        # Make sure "source" attribute is uniconde not list.
-        # For some reason, creating a NotebookNode manually like
-        # this isn't converting source to a string like using
-        # the create-from-file routine.
-        if type(cell_nb.source) is list:
-            cell_nb.source = '\n'.join(cell_nb.source)
-        # Render to rst
-        c = ConverterRST('')
-        rst_list = c.render_heading(cell_nb)
-        # render should return a list
-        nt.assert_true(isinstance(rst_list, list))
-        rst_str = "".join(rst_list)
-        # Confirm rst content
-        chk_str = "Test for heading type H{0}\n{1}\n".format(
-             level, c.heading_level[level] * 24)
-        nt.assert_equal(rst_str, chk_str)
+            # Make sure "source" attribute is uniconde not list.
+            # For some reason, creating a NotebookNode manually like
+            # this isn't converting source to a string like using
+            # the create-from-file routine.
+            if type(cell_nb.source) is list:
+                cell_nb.source = '\n'.join(cell_nb.source)
 
+            # Render to rst
+            c = ConverterRST('')
+            rst_list = c.render_heading(cell_nb)
 
-@nt.with_setup(clean_dir, clean_dir)
-def test_main_html():
-    """
-    Test main entry point
-    """
-    main(fname, format='html')
-    nt.assert_true(os.path.exists('tests/test.html'))
+            # render should return a list
+            nt.assert_true(isinstance(rst_list, list))
+            rst_str = "".join(rst_list)
+
+            # Confirm rst content
+            chk_str = "Test for heading type H{0}\n{1}\n".format(
+                 level, c.heading_level[level] * 24)
+            nt.assert_equal(rst_str, chk_str)
+
+    def test_main_html(self):
+        """
+        Test main entry point
+        """
+        main(self.infile, format='html')
+        nt.assert_true(self.outfile_exists('html'))