diff --git a/csvkit/__init__.py b/csvkit/__init__.py
index 14ae0ec74..d673819d3 100644
--- a/csvkit/__init__.py
+++ b/csvkit/__init__.py
@@ -74,7 +74,7 @@ def writerow(self, row):
             self._append_line_number(row)
 
         # Convert embedded Mac line endings to unix style line endings so they get quoted
-        row = dict([(k, v.replace('\r', '\n')) if isinstance(v, basestring) else v for k, v in row.items()])
+        row = dict([(k, v.replace('\r', '\n')) if isinstance(v, basestring) else (k, v) for k, v in row.items()])
 
         unicsv.UnicodeCSVDictWriter.writerow(self, row)
 
diff --git a/tests/test_utilities/test_csvclean.py b/tests/test_utilities/test_csvclean.py
index 09b8aa66f..6ccb8043d 100644
--- a/tests/test_utilities/test_csvclean.py
+++ b/tests/test_utilities/test_csvclean.py
@@ -18,21 +18,21 @@ def test_simple(self):
         self.assertTrue(os.path.exists('examples/bad_err.csv'))
         self.assertTrue(os.path.exists('examples/bad_out.csv'))
 
-        with open('examples/bad_err.csv') as f:
-            f.next()
-            self.assertEqual(f.next()[0], '1')
-            self.assertEqual(f.next()[0], '2')
-            self.assertRaises(StopIteration, f.next)
-            
-        with open('examples/bad_out.csv') as f:
-            f.next()
-            self.assertEqual(f.next()[0], '0')
-            self.assertRaises(StopIteration, f.next)
-
-        # Cleanup
-        os.remove('examples/bad_err.csv')
-        os.remove('examples/bad_out.csv')
-        sleep(0.1)
+        try:
+            with open('examples/bad_err.csv') as f:
+                f.next()
+                self.assertEqual(f.next()[0], '1')
+                self.assertEqual(f.next()[0], '2')
+                self.assertRaises(StopIteration, f.next)
+                
+            with open('examples/bad_out.csv') as f:
+                f.next()
+                self.assertEqual(f.next()[0], '0')
+                self.assertRaises(StopIteration, f.next)
+        finally:
+            # Cleanup
+            os.remove('examples/bad_err.csv')
+            os.remove('examples/bad_out.csv')
 
     def test_dry_run(self):
         args = ['-n', 'examples/bad.csv']