diff --git a/Ccs/ccs_function_lib.py b/Ccs/ccs_function_lib.py
index a2f4a45f038b18d94078c5dbbe86807649fc0afb..052999a82920caedb521f2b13ddd3dbbc94f4be9 100644
--- a/Ccs/ccs_function_lib.py
+++ b/Ccs/ccs_function_lib.py
@@ -3437,7 +3437,6 @@ def savepool(filename, pool_name, mode='binary', st_filter=None):
 
 def get_packets_from_pool(pool_name, indices=[], st=None, sst=None, apid=None, dbsession=None):
     """
-
     @param pool_name:
     @param indices:
     @param st:
@@ -3472,6 +3471,27 @@ def get_packets_from_pool(pool_name, indices=[], st=None, sst=None, apid=None, d
     new_session.close()
     return ret
 
+def add_tst_import_paths():
+    """
+    Include all paths to TST files that could potentially be used.
+    """
+    # Add general tst path
+    sys.path.append(confignator.get_option('paths', 'tst'))
+    # Add all subfolders
+    sys.path.append(confignator.get_option('paths', 'tst') + '/codeblockreusefeature')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/config_editor')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/confignator')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/doc')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/icon_univie')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/images')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/log_viewer')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/notes')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/progress_view')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/sketch_desk')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/test_specs')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/testing_library')
+    sys.path.append(confignator.get_option('paths', 'tst') + '/tst')
+    return
 
 class TestReport:
 
diff --git a/Tst/config_editor/config_editor.py b/Tst/config_editor/config_editor.py
index f3160f4445fab56cc7de3648c72757299051834f..09bfffd37310cf957efa3b016a0b57f9cf8d5f5b 100644
--- a/Tst/config_editor/config_editor.py
+++ b/Tst/config_editor/config_editor.py
@@ -42,6 +42,9 @@ import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, Gio, GLib, Gdk
 import confignator
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+cfl.add_tst_import_paths()
 
 app_name = 'Configuration Editor'
 dbus_name = 'smile.tst.configeditor'
diff --git a/Tst/log_viewer/log_viewer.py b/Tst/log_viewer/log_viewer.py
index a0c763d0ebdc3af19771e634b0a97f0be0e8dd56..cd3334c820da87ebbcf757b12b986e40c3f15573 100755
--- a/Tst/log_viewer/log_viewer.py
+++ b/Tst/log_viewer/log_viewer.py
@@ -9,6 +9,10 @@ import confignator
 import logging
 import toolbox
 import dbus
+import sys
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+cfl.add_tst_import_paths()
 
 uni_grau = '#666666'
 uni_weiss = '#ffffff'
diff --git a/Tst/progress_view/progress_view.py b/Tst/progress_view/progress_view.py
index 57ca2c62581f3f9f21cde75c9e27028a2dc85619..cd0f9de137ae5b1f4ef33c6ae0e37254781af6d3 100644
--- a/Tst/progress_view/progress_view.py
+++ b/Tst/progress_view/progress_view.py
@@ -14,6 +14,10 @@ import data_model
 import json
 import confignator
 import toolbox
+import sys
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+cfl.add_tst_import_paths()
 
 
 # create a logger
diff --git a/Tst/tst/generator_templates/run_header.py b/Tst/tst/generator_templates/run_header.py
index 7d6bfdbe2c11fa5efad36179d823582556bb2cd2..f339e6e99d7d4faa244af69518412ba8403dc507 100644
--- a/Tst/tst/generator_templates/run_header.py
+++ b/Tst/tst/generator_templates/run_header.py
@@ -57,5 +57,6 @@ if False:
 # Run the test step by step
 
 #! CCS.BREAKPOINT
-# Exectute the preconditions
-threading.Thread(target=testinstance.establish_preconditions, kwargs={'pool_name': pool_name}, daemon=True).start()
+if False:
+    # Exectute the preconditions
+    threading.Thread(target=testinstance.establish_preconditions, kwargs={'pool_name': pool_name}, daemon=True).start()
diff --git a/Tst/tst/generator_templates/run_step.py b/Tst/tst/generator_templates/run_step.py
index 417aea8e2e248ec7491bdea99ed6af95aafd31bd..24e7565d6b608217379662ba32825d88707c1496 100644
--- a/Tst/tst/generator_templates/run_step.py
+++ b/Tst/tst/generator_templates/run_step.py
@@ -1,3 +1,3 @@
-#! CCS.BREAKPOINT
-# Step $testStepNumber: $testStepDescription Comment: $testStepComment
-threading.Thread(target=testinstance.step_$testStepNumber, kwargs={'pool_name': pool_name}, daemon=True).start()
+    #! CCS.BREAKPOINT
+    # Step $testStepNumber: $testStepDescription Comment: $testStepComment
+    threading.Thread(target=testinstance.step_$testStepNumber, kwargs={'pool_name': pool_name}, daemon=True).start()
diff --git a/Tst/tst/tst.py b/Tst/tst/tst.py
index 0eecd364d75016f43524f395ab680c5fa720bbab..68e7a76ab51c02777344ae8b1352436bde63333f 100755
--- a/Tst/tst/tst.py
+++ b/Tst/tst/tst.py
@@ -7,17 +7,18 @@ import gi
 gi.require_version('Gtk', '3.0')
 gi.require_version('GtkSource', '3.0')
 from gi.repository import Gtk, Gdk, Gio, GtkSource, GLib
+import confignator
+import sys
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+cfl.add_tst_import_paths()
 import view
 import data_model
 import file_management
 import tst_logger
 import generator
-import confignator
 import codeblockreuse
 import connect_apps
-import sys
-sys.path.append(confignator.get_option('paths', 'ccs'))
-import ccs_function_lib as cfl
 import dbus
 import toolbox