diff --git a/.github/workflows/autogpts-ci.yml b/.github/workflows/autogpts-ci.yml
index 70ac66ca..6bf0dc18 100644
--- a/.github/workflows/autogpts-ci.yml
+++ b/.github/workflows/autogpts-ci.yml
@@ -1,4 +1,4 @@
-name: AutoGPTs CI
+name: Valid AutoGPTs
 
 on:
   workflow_dispatch:
@@ -8,17 +8,19 @@ on:
   push:
     branches: [master, ci-test*]
     paths:
-      - 'autogpts/forge/**'
-      - '.github/workflows/autogpts-ci.yml'
+      - 'autogpts/**'
   pull_request:
     branches: [stable, master, release-*]
     paths:
-      - 'autogpts/forge/**'
-      - '.github/workflows/autogpts-ci.yml'
+      - 'autogpts/**'
 
 jobs:
-  agent-protocol-test:
+  run-tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        agent-name: [ autogpt, forge ]
+      fail-fast: false
     timeout-minutes: 20
     steps:
       - name: Checkout repository
@@ -35,14 +37,14 @@ jobs:
           python-version: ${{ env.min-python-version }}
 
       - name: Install Poetry
-        working-directory: ./autogpts/forge/
+        working-directory: ./autogpts/${{ matrix.agent-name }}/
         run: |
           curl -sSL https://install.python-poetry.org | python -
 
       - name: Run regression tests
-        working-directory: ./autogpts/forge/
+        working-directory: ./autogpts/${{ matrix.agent-name }}/
         run: |
-          sh run_agent.sh
+          sh run
           URL=http://127.0.0.1:8000 bash -c "$(curl -fsSL https://raw.githubusercontent.com/AI-Engineers-Foundation/agent-protocol/main/testing_suite/test.sh)"
           poetry run agbenchmark start --mock
           poetry run agbenchmark start --test=TestWriteFile
diff --git a/autogpts/forge/run b/autogpts/forge/run
index cda72f5c..b2ea6563 100755
--- a/autogpts/forge/run
+++ b/autogpts/forge/run
@@ -1,8 +1,4 @@
-#!/bin/bash
-
-
-
-# poetry install
-# poetry shell
-
-export PYTHONPATH=$PYTHONPATH:$PWD; watchmedo auto-restart -p "*.py" -R python3 -- autogpt/__main__.py "$@"
+kill $(lsof -t -i :8000)
+poetry install
+cp .env.example .env
+poetry run python -m forge &
diff --git a/autogpts/forge/run_agent.sh b/autogpts/forge/run_agent.sh
deleted file mode 100644
index 1929fe24..00000000
--- a/autogpts/forge/run_agent.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-kill $(lsof -t -i :8000)
-poetry install
-cp .env.example .env
-pip uninstall agbenchmark
-pip install -e ../../benchmark
-poetry run python -m forge &