--- a/usr/src/lib/install_transfer/test/test_p5i.py	Tue Jun 19 02:42:18 2012 -0600
+++ b/usr/src/lib/install_transfer/test/test_p5i.py	Tue Jun 19 12:18:37 2012 -0600
@@ -19,11 +19,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 import os
 import logging
+import shutil
+import tempfile
 import unittest
 
 from solaris_install.engine import InstallEngine
@@ -56,7 +58,9 @@
 
     def setUp(self):
         InstallEngine._instance = None
-        InstallEngine()
+        default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+        default_log = default_log_dir + "/install_log"
+        InstallEngine(default_log)
         self.engine = InstallEngine.get_instance()
         self.doc = self.engine.data_object_cache.volatile
         self.soft_node = Software("P5I transfer")
@@ -70,6 +74,15 @@
     def tearDown(self):
         self.engine.data_object_cache.clear()
         InstallEngine._instance = None
+        try:
+            shutil.rmtree(os.path.dirname(
+                InstallLogger.DEFAULTFILEHANDLER.baseFilename))
+        except:
+            pass
+
+        logging.Logger.manager.loggerDict = {}
+        InstallLogger.DEFAULTFILEHANDLER = None
+
         self.doc = None
         self.soft_node = None
         self.tr_node = None