diff --git a/ice/logs.py b/ice/logs.py
index 4e1509f..04c6de8 100644
--- a/ice/logs.py
+++ b/ice/logs.py
@@ -6,8 +6,9 @@
 Copyright (c) 2013 Scott Rice. All rights reserved.
 """
 
-import sys
+import inspect
 import os
+import sys
 import time
 import traceback
 
@@ -16,6 +17,16 @@
 
 import paths
 
+def is_test_stack_frame(frame):
+  # The path of the executing file is in frame[1]
+  path = frame[1]
+  # See if the path is in the unittest module
+  return "unittest" in path
+
+def is_running_in_test():
+  current_stack = inspect.stack()
+  return any(map(is_test_stack_frame, inspect.stack()))
+
 class IceLevelTagFilter(logging.Formatter):
 
   def _tag_for_level(self, levelno):
@@ -47,8 +58,9 @@ def create_logger():
     # loggers
     logger = logging.getLogger('Ice')
     logger.setLevel(logging.DEBUG)
-    logger.addHandler(ch)
-    logger.addHandler(fh)
+    if not is_running_in_test():
+      logger.addHandler(ch)
+      logger.addHandler(fh)
     return logger
 
 logger = create_logger()