diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d15a996bd..0ed88dd150 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,21 +37,6 @@ execution_steps: &execution_steps
     - run: hostPath=$HOME/.esvu/bin/$hostPath npm run ci
 
 jobs:
-  "Test262: verify tools; build tests":
-    docker:
-      - image: cimg/python:3.7.4
-    working_directory: ~/test262
-    steps:
-      - checkout
-      - run:
-          name: "Install requirements for generation tool"
-          command: python -m pip install --user --requirement tools/generation/requirements.txt
-      - run:
-          name: "Test the generation tool"
-          command: ./tools/generation/test/run.py
-      - run:
-          name: "Build tests; check for new changes"
-          command: ./tools/scripts/ci_build.sh
   "V8: New or modified tests execution":
     docker:
       - image: *node_image
@@ -123,9 +108,6 @@ jobs:
     <<: [*execution_steps]
 workflows:
   version: 2
-  Tools:
-    jobs:
-      - "Test262: verify tools; build tests"
   Tests execution:
     jobs:
       # - "ChakraCore: New or modified tests execution"
diff --git a/.github/workflows/checks-main.yml b/.github/workflows/checks-main.yml
index 259de1c2f4..0dacef58e7 100644
--- a/.github/workflows/checks-main.yml
+++ b/.github/workflows/checks-main.yml
@@ -26,3 +26,36 @@ jobs:
 
       - name: Lint all tests
         run: ./tools/lint/lint.py test/
+
+  build:
+    name: Build generated tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+          cache: pip
+
+      - name: Install dependencies for generation tool
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r tools/generation/requirements.txt
+
+      - name: Test the generation tool
+        run: ./tools/generation/test/run.py
+
+      - name: Build tests
+        run: ./tools/scripts/ci_build.sh
+
+      - name: Verify changes
+        uses: tj-actions/verify-changed-files@v20
+        with:
+          fail-if-changed: true
+          fail-message: |
+            New changes were found after re-generating the tests.
+            Please read the documentation on procedurally generated tests
+            https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#procedurally-generated-tests
diff --git a/.github/workflows/checks-pr.yml b/.github/workflows/checks-pr.yml
index 86a5900a95..e6d70f3e01 100644
--- a/.github/workflows/checks-pr.yml
+++ b/.github/workflows/checks-pr.yml
@@ -46,3 +46,37 @@ jobs:
         run: |
           awk -F': ' <errors.out \
             "{ sub(\"$(pwd)/\", \"\"); printf \"::error file=%s,line=1::%s\n\", \$1, \$2 }"
+
+
+  build:
+    name: Build generated tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+          cache: pip
+
+      - name: Install dependencies for generation tool
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r tools/generation/requirements.txt
+
+      - name: Test the generation tool
+        run: ./tools/generation/test/run.py
+
+      - name: Build tests
+        run: ./tools/scripts/ci_build.sh
+
+      - name: Verify changes
+        uses: tj-actions/verify-changed-files@v20
+        with:
+          fail-if-changed: true
+          fail-message: |
+            New changes were found after re-generating the tests.
+            Please read the documentation on procedurally generated tests
+            https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#procedurally-generated-tests
diff --git a/tools/scripts/ci_build.sh b/tools/scripts/ci_build.sh
index ad3e8abce9..b1eaea1694 100755
--- a/tools/scripts/ci_build.sh
+++ b/tools/scripts/ci_build.sh
@@ -1,17 +1,3 @@
 #!/bin/sh
-if [ "$CIRCLE_PULL_REQUEST" != "" ]; then
-  ./make.py clean > /dev/null
-fi
+./make.py clean > /dev/null
 ./make.py
-
-if [ -n "$(git status --porcelain)" -a "$CIRCLE_PULL_REQUEST" != "" ]; then
-  echo New changes were found after re-generating the tests.
-  echo ""
-  git status --porcelain;
-  echo ""
-  git diff;
-  echo ""
-  echo Please, read the documentation on procedurally generated tests
-  echo 'https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#procedurally-generated-tests'
-  exit 1
-fi