--- a/usr/src/lib/install_logging_pymod/test/test_logger.py	Fri Jun 29 10:15:59 2012 -0700
+++ b/usr/src/lib/install_logging_pymod/test/test_logger.py	Fri Jun 29 00:42:35 2012 -0600
@@ -146,6 +146,12 @@
         logging.setLoggerClass(logging.Logger)
         logging._defaultFormatter = logging.Formatter()
 
+        try:
+            shutil.rmtree(self.log_tmp_dir)
+        except:
+            # File doesn't exist
+            pass
+
     def test_no_default_logfile(self):
         '''Test that the logger does not fail with no default log'''
         logging.setLoggerClass(InstallLogger)
@@ -158,7 +164,6 @@
         LOGGER = InstallLogger.manager.getLogger(INSTALL_LOGGER_NAME)
         self.log_tmp_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
         self.logfile = os.path.join(self.log_tmp_dir, TEST_LOG)
-
         fh = logging.FileHandler(self.logfile)
         LOGGER.addHandler(fh)
         LOGGER.info('This is from the logger')
@@ -177,12 +182,13 @@
         self.log_tmp_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
         self.logfile = os.path.join(self.log_tmp_dir, TEST_LOG)
         self.pid = str(os.getpid())
-        self.eng = get_new_engine_instance(default_log=self.logfile)
+        self.eng = TestInstallEngine(self.logfile)
         self.test_logger = logging.getLogger(INSTALL_LOGGER_NAME)
         self.list = []
 
     def tearDown(self):
         self.eng = None
+        TestInstallEngine._instance = None
         InstallLogger.DEFAULTFILEHANDLER = None
         logging.Logger.manager.loggerDict = {}
         logging.setLoggerClass(logging.Logger)