diff --git a/src/Mod/Arch/TestArch.py b/src/Mod/Arch/TestArch.py
index 4d3bbb3931..d363067448 100644
--- a/src/Mod/Arch/TestArch.py
+++ b/src/Mod/Arch/TestArch.py
@@ -23,7 +23,19 @@
 #*                                                                         *
 #***************************************************************************/
 
-import FreeCAD, os, unittest, FreeCADGui, Arch, Draft, Part, Sketcher
+import os
+import unittest
+
+import FreeCAD
+
+import Arch
+import Draft
+import Part
+import Sketcher
+
+if FreeCAD.GuiUp:
+    import FreeCADGui
+
 
 class ArchTest(unittest.TestCase):