diff --git a/.github/workflows/test-indicator.yml b/.github/workflows/test-indicator.yml
index ed589c697..c423bc459 100644
--- a/.github/workflows/test-indicator.yml
+++ b/.github/workflows/test-indicator.yml
@@ -1,18 +1,21 @@
 ---
 name: Test Indicator
 
+env:
+  TEST_PATH: Indicator/tests
+
 # yamllint disable-line rule:truthy
 on:
   pull_request:
     paths:
-      - 'Indicator**'
-      - 'Indicator/**'
-      - '.github/workflows/test-indicator.yml'
+      - .github/workflows/test-indicator.yml
+      - Indicator**
+      - Indicator/**
   push:
     paths:
-      - 'Indicator**'
-      - 'Indicator/**'
-      - '.github/workflows/test-indicator.yml'
+      - .github/workflows/test-indicator.yml
+      - Indicator**
+      - Indicator/**
 
 jobs:
 
@@ -24,12 +27,12 @@ jobs:
       path: Indicator/tests
       skip_cleanup: true
 
-  Tests-MQL4:
+  test:
     defaults:
       run:
         shell: bash
-        working-directory: Indicator/tests
-    if: false
+        working-directory: ${{ env.TEST_PATH }}
+    name: Test
     needs: compile
     runs-on: ubuntu-latest
     strategy:
@@ -42,20 +45,32 @@ jobs:
           - IndicatorTf.test
           - IndicatorTick.test
           - IndicatorRenko.test
+        version: [5]
+      max-parallel: 4
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: files-ex4
+          name: files-ex${{ matrix.version }}
+      - name: List compiled files
+        run: find . -name '*.ex?' -type f -print
       - name: Run ${{ matrix.test }}
         uses: fx31337/mql-tester-action@master
         with:
-          BtDays: 4-8
-          BtMonths: 1
-          BtYears: 2021
-          GitHubApiToken: ${{ github.token }}
-          RunOnError: show_logs 200
+          Login: ${{ secrets.MT5_LOGIN }}
+          Password: ${{ secrets.MT5_PASSWORD }}
+          Server: MetaQuotes-Demo
+          TestDeposit: 2000
           TestExpert: ${{ matrix.test }}
-    timeout-minutes: 10
+          TestFromDate: ${{ matrix.year }}.01.01
+          TestPeriod: M1
+          TestSymbol: EURUSD
+          TestToDate: ${{ matrix.year }}.01.14
+          # yamllint disable-line rule:line-length
+          UrlExpert: file://${{ github.workspace }}/${{ env.TEST_PATH }}/${{ matrix.test }}.ex${{ matrix.version }}
+          Version: 5
+      - if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
+    timeout-minutes: 20
 
   cleanup:
     name: Clean-up
diff --git a/.github/workflows/test-indicators-pricemulti.yml b/.github/workflows/test-indicators-pricemulti.yml
index 2bf852d55..bbcbd8edd 100644
--- a/.github/workflows/test-indicators-pricemulti.yml
+++ b/.github/workflows/test-indicators-pricemulti.yml
@@ -24,7 +24,7 @@ jobs:
     uses: ./.github/workflows/compile-mql.yml
     with:
       artifact_prefix: mt
-      path: Indicators/Price/tests
+      path: Indicators/PriceMulti/tests
       skip_cleanup: true
 
   test:
diff --git a/.github/workflows/test-indicators-pricerange.yml b/.github/workflows/test-indicators-pricerange.yml
index a293e74fd..bf4d58812 100644
--- a/.github/workflows/test-indicators-pricerange.yml
+++ b/.github/workflows/test-indicators-pricerange.yml
@@ -24,7 +24,7 @@ jobs:
     uses: ./.github/workflows/compile-mql.yml
     with:
       artifact_prefix: mt
-      path: Indicators/Price/tests
+      path: Indicators/PriceRange/tests
       skip_cleanup: true
 
   test:
diff --git a/.github/workflows/test-indicators.yml b/.github/workflows/test-indicators.yml
index c87053c43..3c6c764be 100644
--- a/.github/workflows/test-indicators.yml
+++ b/.github/workflows/test-indicators.yml
@@ -1,18 +1,21 @@
 ---
 name: Test Indicators
 
+env:
+  TEST_PATH: Indicators/tests
+
 # yamllint disable-line rule:truthy
 on:
   pull_request:
     paths:
-      - 'Indicator**'
-      - 'Indicators/**'
-      - '.github/workflows/test-indicators.yml'
+      - .github/workflows/test-indicators.yml
+      - Indicator**
+      - Indicators/**
   push:
     paths:
-      - 'Indicator**'
-      - 'Indicators/**'
-      - '.github/workflows/test-indicators.yml'
+      - .github/workflows/test-indicators.yml
+      - Indicator**
+      - Indicators/**
 
 jobs:
 
@@ -24,12 +27,12 @@ jobs:
       path: Indicators/tests
       skip_cleanup: true
 
-  Tests-MQL4:
+  test:
     defaults:
       run:
         shell: bash
-        working-directory: Indicators/tests
-    if: false
+        working-directory: ${{ env.TEST_PATH }}
+    name: Test
     needs: compile
     runs-on: ubuntu-latest
     strategy:
@@ -86,20 +89,32 @@ jobs:
           - Indicators.test
           # Requires refactoring:
           # - Indi_DEMA.test
+        version: [5]
+      max-parallel: 4
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: files-ex4
+          name: files-ex${{ matrix.version }}
+      - name: List compiled files
+        run: find . -name '*.ex?' -type f -print
       - name: Run ${{ matrix.test }}
         uses: fx31337/mql-tester-action@master
         with:
-          BtDays: 4-8
-          BtMonths: 1
-          BtYears: 2021
-          GitHubApiToken: ${{ github.token }}
-          RunOnError: show_logs 200
+          Login: ${{ secrets.MT5_LOGIN }}
+          Password: ${{ secrets.MT5_PASSWORD }}
+          Server: MetaQuotes-Demo
+          TestDeposit: 2000
           TestExpert: ${{ matrix.test }}
-    timeout-minutes: 10
+          TestFromDate: ${{ matrix.year }}.01.01
+          TestPeriod: M1
+          TestSymbol: EURUSD
+          TestToDate: ${{ matrix.year }}.01.14
+          # yamllint disable-line rule:line-length
+          UrlExpert: file://${{ github.workspace }}/${{ env.TEST_PATH }}/${{ matrix.test }}.ex${{ matrix.version }}
+          Version: 5
+      - if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
+    timeout-minutes: 20
 
   cleanup:
     name: Clean-up