diff --git a/.github/workflows/catch_flaky.yml b/.github/workflows/catch_flaky.yml
index 0a1f0908..38e650bd 100644
--- a/.github/workflows/catch_flaky.yml
+++ b/.github/workflows/catch_flaky.yml
@@ -73,15 +73,6 @@ jobs:
       - name: Install test requirements
         run: pip3 install --user -r test-run/requirements.txt
 
-      - name: Setup tt
-        run: |
-          curl -L https://tarantool.io/release/2/installer.sh | sudo bash
-          sudo apt install -y tt
-          tt version
-
-      - name: Setup luatest
-        run: tt rocks install luatest 1.4.1
-
       - run: cmake .
       - run: make test-flaky
         env:
diff --git a/.github/workflows/fast_testing.yml b/.github/workflows/fast_testing.yml
index 8fbf1b89..2120e201 100644
--- a/.github/workflows/fast_testing.yml
+++ b/.github/workflows/fast_testing.yml
@@ -100,14 +100,5 @@ jobs:
       - name: Install test requirements
         run: pip3 install --user -r test-run/requirements.txt
 
-      - name: Setup tt
-        run: |
-          curl -L https://tarantool.io/release/2/installer.sh | sudo bash
-          sudo apt install -y tt
-          tt version
-
-      - name: Setup luatest
-        run: tt rocks install luatest 1.4.1
-
       - run: cmake .
       - run: make test-force
diff --git a/.github/workflows/reusable_testing.yml b/.github/workflows/reusable_testing.yml
index 1468c9f3..a6582902 100644
--- a/.github/workflows/reusable_testing.yml
+++ b/.github/workflows/reusable_testing.yml
@@ -37,14 +37,5 @@ jobs:
       - name: 'Install test requirements'
         run: pip3 install --user -r test-run/requirements.txt
 
-      - name: Setup tt
-        run: |
-          curl -L https://tarantool.io/release/2/installer.sh | sudo bash
-          sudo apt install -y tt
-          tt version
-
-      - name: Setup luatest
-        run: tt rocks install luatest 1.4.1
-
       - run: cmake .
       - run: make test-force
diff --git a/.gitmodules b/.gitmodules
index 452e046b..7a15794c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "test/test-run"]
 	path = test-run
 	url = https://github.com/tarantool/test-run.git
+[submodule "luatest"]
+	path = luatest
+	url = https://github.com/tarantool/luatest.git
diff --git a/luatest b/luatest
new file mode 160000
index 00000000..4d38d7c8
--- /dev/null
+++ b/luatest
@@ -0,0 +1 @@
+Subproject commit 4d38d7c89d07e5c072fc67115ff117d70cf211b0
diff --git a/test-run b/test-run
index aaba7367..6a0b1c39 160000
--- a/test-run
+++ b/test-run
@@ -1 +1 @@
-Subproject commit aaba736747cf2acf77eba41ec38878c9dbe1fea0
+Subproject commit 6a0b1c397d7760c3dc289d9f79afe8219de3916c