diff --git a/cmd/root.go b/cmd/root.go
index 9dd3b9cf..9510b92b 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	cmd "github.com/elastic/beats/libbeat/cmd"
 	"github.com/icinga/icingabeat/beater"
+
+	cmd "github.com/elastic/beats/libbeat/cmd"
 )
 
 // Name of this beat
diff --git a/tests/system/icingabeat.py b/tests/system/icingabeat.py
index 25459e57..0ba0da5f 100644
--- a/tests/system/icingabeat.py
+++ b/tests/system/icingabeat.py
@@ -2,6 +2,7 @@ import sys
 sys.path.append('../../vendor/github.com/elastic/beats/libbeat/tests/system')
 from beat.beat import TestCase
 
+
 class BaseTest(TestCase):
 
     @classmethod
diff --git a/tests/system/test_base.py b/tests/system/test_base.py
index f6541120..cd8af5d7 100644
--- a/tests/system/test_base.py
+++ b/tests/system/test_base.py
@@ -10,10 +10,10 @@ class Test(BaseTest):
         Basic test with exiting Icingabeat normally
         """
         self.render_config_template(
-                path=os.path.abspath(self.working_dir) + "/log/*"
+            path=os.path.abspath(self.working_dir) + "/log/*"
         )
 
         icingabeat_proc = self.start_beat()
-        self.wait_until( lambda: self.log_contains("icingabeat is running"))
+        self.wait_until(lambda: self.log_contains("icingabeat is running"))
         exit_code = icingabeat_proc.kill_and_wait()
         assert exit_code == 0