diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
index 85dd557bf9..09a85b4c49 100644
--- a/.github/workflows/soroban-rpc.yml
+++ b/.github/workflows/soroban-rpc.yml
@@ -100,8 +100,8 @@ jobs:
           CGO_ENABLED: 1
           GOARCH: ${{ matrix.go_arch }}
 
-  integration:
-    name: Integration tests
+  cli:
+    name: CLI integration tests
     strategy:
       matrix:
         os: [ubuntu-20.04]
@@ -170,6 +170,80 @@ jobs:
       - name: Build libpreflight
         run: make build-libpreflight
 
-      - name: Run Soroban RPC Integration Tests
+      - name: Run CLI tests
         run: |
-          go test -race -timeout 30m -v ./cmd/soroban-rpc/internal/test/...
+          go test -race -run '.*CLI.*' -timeout 60m -v ./cmd/soroban-rpc/internal/test/...
+
+  non-cli:
+    name: 
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        go: [1.20.1]
+    env:
+      SOROBAN_RPC_INTEGRATION_TESTS_ENABLED: true
+      SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.13.1-1481.3acf6dd26.focal
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          # For pull requests, build and test the PR head not a merge of the PR with the destination.
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
+          # We need to full history for git-restore-mtime to know what modification dates to use.
+          # Otherwise, the Go test cache will fail (due to the modification time of fixtures changing).
+          fetch-depth: "0"
+
+      - uses: ./.github/actions/setup-go
+        with:
+          go-version: ${{ matrix.go }}
+      - uses: stellar/actions/rust-cache@main
+      - name: Build soroban contract fixtures
+        run: |
+          rustup update
+          rustup target add wasm32-unknown-unknown
+          make build_rust
+          make build-test-wasms
+
+      - name: Install Captive Core
+        run: |
+          # Workaround for https://github.com/actions/virtual-environments/issues/5245,
+          # libc++1-8 won't be installed if another version is installed (but apt won't give you a helpful
+          # message about why the installation fails)
+          sudo apt-get remove -y libc++1-10 libc++abi1-10 || true
+
+          sudo wget -qO - https://apt.stellar.org/SDF.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true sudo apt-key add -
+          sudo bash -c 'echo "deb https://apt.stellar.org focal unstable" > /etc/apt/sources.list.d/SDF-unstable.list'
+          sudo apt-get update && sudo apt-get install -y stellar-core="$PROTOCOL_20_CORE_DEBIAN_PKG_VERSION"
+          echo "Using stellar core version $(stellar-core version)"
+
+      # Docker-compose's remote contexts on Ubuntu 20 started failing with an OpenSSL versioning error.
+      # See https://stackoverflow.com/questions/66579446/error-executing-docker-compose-building-webserver-unable-to-prepare-context-un
+      - name: Work around Docker Compose problem
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ca-certificates curl gnupg
+
+          # Install docker apt repo
+          sudo install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+          sudo chmod a+r /etc/apt/keyrings/docker.gpg
+          echo \
+            "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+            "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+            sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+          # Install docker-compose v2 from apt repo
+          sudo apt-get update
+          sudo apt-get remove -y moby-compose
+          sudo apt-get install -y docker-compose-plugin
+
+          echo "Docker Compose Version:"
+          docker-compose version
+
+      - name: Build libpreflight
+        run: make build-libpreflight
+
+      - name: Run non-CLI tests
+        run: |
+          go test -race -run '^Test(([^C])|(C[^L])|(CL[^I])).*$' -timeout 60m -v ./cmd/soroban-rpc/internal/test/...