diff --git a/pyfstat.py b/pyfstat.py
index 6aa7cf8d0059545e5b7a9d7510e701304c53fd38..91b0e0991e98b9efc44662d865a4c48cbdc4cbad 100755
--- a/pyfstat.py
+++ b/pyfstat.py
@@ -51,14 +51,17 @@ parser.add_argument('unittest_args', nargs='*')
 args, unknown = parser.parse_known_args()
 sys.argv[1:] = args.unittest_args
 
+
+logger = logging.getLogger()
+logger.setLevel(logging.DEBUG)
+stream_handler = logging.StreamHandler()
 if args.quite:
-    log_level = logging.WARNING
+    stream_handler.setLevel(logging.WARNING)
 else:
-    log_level = logging.DEBUG
-
-logging.basicConfig(level=log_level,
-                    format='%(asctime)s %(levelname)-8s: %(message)s',
-                    datefmt='%H:%M')
+    stream_handler.setLevel(logging.DEBUG)
+stream_handler.setFormatter(logging.Formatter(
+    '%(asctime)s %(levelname)-8s: %(message)s', datefmt='%H:%M'))
+logger.addHandler(stream_handler)
 
 
 def initializer(func):
@@ -102,6 +105,7 @@ class BaseSearchClass(object):
         ' Log output to a log-file, requires class to have outdir and label '
         logfilename = '{}/{}.log'.format(self.outdir, self.label)
         fh = logging.FileHandler(logfilename)
+        fh.setLevel(logging.INFO)
         fh.setFormatter(logging.Formatter(
             '%(asctime)s %(levelname)-8s: %(message)s',
             datefmt='%y-%m-%d %H:%M'))