diff --git a/deckard.py b/deckard.py
index f34e1a5d091590439a130954d26ef9e331a2fccd..46e1753ea495e4f86875f86f98ebbdee62420980 100755
--- a/deckard.py
+++ b/deckard.py
@@ -22,7 +22,7 @@ import itertools
 import calendar
 
 def str2bool(v):
-    """ Return conversion of JSON-ish string value to boolean. """ 
+    """ Return conversion of JSON-ish string value to boolean. """
     return v.lower() in ('yes', 'true', 'on')
 
 
@@ -46,7 +46,7 @@ DEFAULT_FEATURE_LIST_DELIM = ';'
 DEFAULT_FEATURE_PAIR_DELIM = '='
 
 if "SOCKET_WRAPPER_DEFAULT_IFACE" in os.environ:
-   DEFAULT_IFACE = int(os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"])
+    DEFAULT_IFACE = int(os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"])
 if DEFAULT_IFACE < 2 or DEFAULT_IFACE > 254 :
     DEFAULT_IFACE = 2
     os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"]="{}".format(DEFAULT_IFACE)
@@ -101,7 +101,7 @@ def setup_env(scenario, child_env, config, config_name_list, j2template_list):
     child_env["FAKETIME_NO_CACHE"] = "1"
     child_env["FAKETIME_TIMESTAMP_FILE"] = '%s/.time' % TMPDIR
     write_timestamp_file(child_env["FAKETIME_TIMESTAMP_FILE"], int (time.time()))
-    # Set up child process env() 
+    # Set up child process env()
     child_env["SOCKET_WRAPPER_DEFAULT_IFACE"] = "%i" % CHILD_IFACE
     child_env["SOCKET_WRAPPER_DIR"] = TMPDIR
     # do not pass SOCKET_WRAPPER_PCAP_FILE into child to avoid duplicate packets in pcap
@@ -217,8 +217,8 @@ def play_object(path, binary_name, config_name, j2template, binary_additional_pa
     daemon_log = open('%s/server.log' % TMPDIR, 'w')
     daemon_args = [binary_name] + binary_additional_pars
     try :
-      daemon_proc = subprocess.Popen(daemon_args, stdout=daemon_log, stderr=daemon_log,
-                                     cwd=TMPDIR, preexec_fn=os.setsid, env=daemon_env)
+        daemon_proc = subprocess.Popen(daemon_args, stdout=daemon_log, stderr=daemon_log,
+                                       cwd=TMPDIR, preexec_fn=os.setsid, env=daemon_env)
     except Exception as e:
         server.stop()
         raise Exception("Can't start '%s': %s" % (daemon_args, str(e)))
@@ -304,9 +304,9 @@ if __name__ == '__main__':
         template_name_list = sys.argv[3].split(':')
         config_name_list = sys.argv[4].split(':')
         if len(template_name_list) != len (config_name_list):
-                print("ERROR: Number of j2 template files not equal to number of file names to be generated")
-                print("i.e. len(<template>) != len(<config name>), see usage")
-                sys.exit(0)
+            print("ERROR: Number of j2 template files not equal to number of file names to be generated")
+            print("i.e. len(<template>) != len(<config name>), see usage")
+            sys.exit(0)
 
     if len(sys.argv) > 5:
         binary_additional_pars = sys.argv[5:]
diff --git a/pydnstest/dprint.py b/pydnstest/dprint.py
index 238af2b2bb17cfcccb30ac1d19231f8db5ee3d71..229c45b26912f46c259b30bb56178da5c8149824 100755
--- a/pydnstest/dprint.py
+++ b/pydnstest/dprint.py
@@ -11,4 +11,3 @@ def dprint(tag, msg):
         dprint_lock.acquire()
         print(tag, msg)
         dprint_lock.release()
-
diff --git a/pydnstest/scenario.py b/pydnstest/scenario.py
index 8755ab4c61c6793a2846b01d3a560025123e08d2..be0cd88da89c6d08a0a8ac10eea89e99634afa5d 100644
--- a/pydnstest/scenario.py
+++ b/pydnstest/scenario.py
@@ -434,7 +434,7 @@ class Step:
         self.repeat_if_fail = 0
         self.pause_if_fail = 0
         self.next_if_fail = -1
-        
+
         if type == 'CHECK_ANSWER':
             for arg in extra_args:
                 param = arg.split('=')
diff --git a/pydnstest/testserver.py b/pydnstest/testserver.py
index c3cc16a658d9255af62dbe543cbf23138a9821c4..a88ed6ebdb065f3442bf7f5147f5738f3f3d1fd8 100644
--- a/pydnstest/testserver.py
+++ b/pydnstest/testserver.py
@@ -204,23 +204,23 @@ class TestServer:
         if self.active is False:
             raise Exception("[query_io] Test server not active")
         while self.active is True:
-           objects = self.srv_socks + self.connections
-           to_read, _, to_error = select.select(objects, [], objects, 0.1)
-           for sock in to_read:
-              if sock in self.srv_socks:
-                  if (sock.proto == socket.IPPROTO_TCP):
-                      conn, addr = sock.accept()
-                      self.connections.append(conn)
-                  else:
-                      self.handle_query(sock)
-              elif sock in self.connections:
-                  if not self.handle_query(sock):
-                      sock.close()
-                      self.connections.remove(sock)
-              else:
-                  raise Exception("[query_io] Socket IO internal error {}, exit".format(sock.getsockname()))
-           for sock in to_error:
-              raise Exception("[query_io] Socket IO error {}, exit".format(sock.getsockname()))
+            objects = self.srv_socks + self.connections
+            to_read, _, to_error = select.select(objects, [], objects, 0.1)
+            for sock in to_read:
+                if sock in self.srv_socks:
+                    if (sock.proto == socket.IPPROTO_TCP):
+                        conn, addr = sock.accept()
+                        self.connections.append(conn)
+                    else:
+                        self.handle_query(sock)
+                elif sock in self.connections:
+                    if not self.handle_query(sock):
+                        sock.close()
+                        self.connections.remove(sock)
+                else:
+                    raise Exception("[query_io] Socket IO internal error {}, exit".format(sock.getsockname()))
+            for sock in to_error:
+                raise Exception("[query_io] Socket IO error {}, exit".format(sock.getsockname()))
 
     def start_srv(self, address = None, family = socket.AF_INET, proto = socket.IPPROTO_UDP):
         """ Starts listening thread if necessary """
@@ -277,7 +277,7 @@ if __name__ == '__main__':
     DEFAULT_IFACE = 0
     CHILD_IFACE = 0
     if "SOCKET_WRAPPER_DEFAULT_IFACE" in os.environ:
-       DEFAULT_IFACE = int(os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"])
+        DEFAULT_IFACE = int(os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"])
     if DEFAULT_IFACE < 2 or DEFAULT_IFACE > 254 :
         DEFAULT_IFACE = 10
         os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"]="{}".format(DEFAULT_IFACE)