diff --git a/test/functional/api/cas/installer.py b/test/functional/api/cas/installer.py
index 4861286..638fc11 100644
--- a/test/functional/api/cas/installer.py
+++ b/test/functional/api/cas/installer.py
@@ -9,7 +9,8 @@ import os
 from core.test_run import TestRun
 from api.cas import cas_module
 from api.cas.version import get_installed_cas_version
-from test_utils import os_utils, git
+from test_utils import os_utils
+from test_tools import git
 from connection.utils.output import CmdException
 
 
diff --git a/test/functional/api/cas/version.py b/test/functional/api/cas/version.py
index 1ce6583..116494c 100644
--- a/test/functional/api/cas/version.py
+++ b/test/functional/api/cas/version.py
@@ -6,7 +6,7 @@
 
 import re
 
-from test_utils import git
+from test_tools import git
 from core.test_run import TestRun
 from connection.utils.output import CmdException
 
@@ -43,7 +43,7 @@ class CasVersion:
 
 
 def get_available_cas_versions():
-    release_tags = git.get_release_tags()
+    release_tags = git.get_tags()
 
     versions = [CasVersion.from_git_tag(tag) for tag in release_tags]
 
diff --git a/test/functional/test-framework b/test/functional/test-framework
index 324edb0..40f850c 160000
--- a/test/functional/test-framework
+++ b/test/functional/test-framework
@@ -1 +1 @@
-Subproject commit 324edb0eba157b21374ce730bfb6b85f78fd0126
+Subproject commit 40f850c1f9077039ec8f50f713bf75adfc9a0170
diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py
index d3435ce..49ccdb9 100644
--- a/test/functional/tests/conftest.py
+++ b/test/functional/tests/conftest.py
@@ -20,7 +20,6 @@ from core.test_run import Blocked
 from core.test_run_utils import TestRun
 from api.cas import installer
 from api.cas import casadm
-from test_utils import git
 from api.cas.cas_service import opencas_drop_in_directory
 from storage_devices.raid import Raid
 from storage_devices.ramdisk import RamDisk
@@ -30,7 +29,7 @@ from test_tools.disk_utils import PartitionTable, create_partition_table
 from test_tools.device_mapper import DeviceMapper
 from test_tools.mdadm import Mdadm
 from test_tools.fs_utils import remove
-from test_tools import initramfs
+from test_tools import initramfs, git
 from log.logger import create_log, Log
 from test_utils.common.singleton import Singleton
 from storage_devices.lvm import Lvm, LvmConfiguration
diff --git a/test/functional/tests/misc/test_files_permissions.py b/test/functional/tests/misc/test_files_permissions.py
index b96cf86..34c9a0e 100644
--- a/test/functional/tests/misc/test_files_permissions.py
+++ b/test/functional/tests/misc/test_files_permissions.py
@@ -7,7 +7,7 @@
 
 import os
 
-from test_utils.git import get_repo_files
+from test_tools.git import get_repo_files
 from api.cas.installer import (
     clean_opencas_repo,
     build_opencas,