diff --git a/.github/workflows/solidity-tests.yml b/.github/workflows/solidity-tests.yml
index 6a317f981..7e2832d59 100644
--- a/.github/workflows/solidity-tests.yml
+++ b/.github/workflows/solidity-tests.yml
@@ -1,7 +1,12 @@
-name: Solidity Equivalence Tests CI
+name: Solidity Equivalence Tests
 
 on:
-  workflow_call:
+  workflow_dispatch:
+    inputs:
+      filterTagOverride:
+        description: 'The Test filter tag to use for overrides'
+        required: false
+        type: string
 
 concurrency:
   group: tests-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -13,18 +18,41 @@ permissions:
   pull-requests: write
 
 jobs:
-  SolidityEquivalence:
-    name: BlockInfo Test Suite
+  CustomFilterTagTest:
+    if: ${{ inputs.filterTagOverride != ''}}
+    name: ${{ inputs.filterTagOverride }} Tests
     uses: ./.github/workflows/test-workflow.yml
     with:
-      testfilter: '@solidityequiv'
+      testfilter: ${{ inputs.filterTagOverride }}
 
+  SolidityEquivalence1:
+    if: ${{ inputs.filterTagOverride == ''}}
+    name: Solidity Equivalence Suite 1
+    uses: ./.github/workflows/test-workflow.yml
+    with:
+      testfilter: '@solidityequiv1'
+
+  SolidityEquivalence2:
+    if: ${{ inputs.filterTagOverride == ''}}
+    name: Solidity Equivalence Suite 2
+    uses: ./.github/workflows/test-workflow.yml
+    with:
+      testfilter: '@solidityequiv2'
+
+  SolidityEquivalence3:
+    if: ${{ inputs.filterTagOverride == ''}}
+    name: Solidity Equivalence Suite 3
+    uses: ./.github/workflows/test-workflow.yml
+    with:
+      testfilter: '@solidityequiv3'
 
   PublishResults:
     name: Publish Results
     if: ${{ !cancelled() }}
     needs:
-      - BlockInfo
+      - SolidityEquivalence1
+      - SolidityEquivalence2
+      - SolidityEquivalence3
 
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
index eda20a26a..c3a025ec2 100644
--- a/.github/workflows/test-workflow.yml
+++ b/.github/workflows/test-workflow.yml
@@ -40,11 +40,6 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-
       - name: Start the local node
         run: npx hedera start -d --network local
         timeout-minutes: 5
diff --git a/test/solidity/concatenation/concatenation.js b/test/solidity/concatenation/concatenation.js
index 18502faf3..7f413efbe 100644
--- a/test/solidity/concatenation/concatenation.js
+++ b/test/solidity/concatenation/concatenation.js
@@ -2,7 +2,7 @@ const { expect } = require('chai')
 const { ethers } = require('hardhat')
 const Constants = require('../../constants')
 
-describe('Concatenation', function () {
+describe('@solidityequiv2 Concatenation', function () {
     let signers;
     let contract;
     const first = 'first';
diff --git a/test/solidity/cryptomath/CryptoMath.js b/test/solidity/cryptomath/CryptoMath.js
index aba3b6ec9..a94c304b8 100644
--- a/test/solidity/cryptomath/CryptoMath.js
+++ b/test/solidity/cryptomath/CryptoMath.js
@@ -21,7 +21,7 @@ const { expect } = require('chai')
 const { ethers } = require('hardhat')
 const Constants = require('../../constants')
 
-describe('@solidityevmequiv CryptoMath Test Suite', function () {
+describe('@solidityevmequiv1 CryptoMath Test Suite', function () {
     let cryptoMathContract, provider, signers;
 
 
diff --git a/test/solidity/encoding/Encoding.js b/test/solidity/encoding/Encoding.js
index 329ef4c91..f615862ae 100644
--- a/test/solidity/encoding/Encoding.js
+++ b/test/solidity/encoding/Encoding.js
@@ -20,7 +20,7 @@
 const { expect } = require("chai");
 const { ethers } = require("hardhat");
 
-describe("@solidityevmequiv Encoding", function() {
+describe("@solidityevmequiv1 Encoding", function() {
     let encodingContract, receiver, sender;
 
     const addressData = "0x1234567890123456789012345678901234567890";
diff --git a/test/solidity/errors/errors.js b/test/solidity/errors/errors.js
index a4f65c98d..a1ad9c07a 100644
--- a/test/solidity/errors/errors.js
+++ b/test/solidity/errors/errors.js
@@ -2,7 +2,7 @@ const { expect, assert } = require('chai')
 const { ethers } = require('hardhat')
 const Constants = require('../../constants')
 
-describe('Solidity Errors', function () {
+describe('@solidityequiv2 Solidity Errors', function () {
   let signers
   let contract
 
diff --git a/test/solidity/new/New.js b/test/solidity/new/New.js
index f94dc29c5..163c416f0 100644
--- a/test/solidity/new/New.js
+++ b/test/solidity/new/New.js
@@ -22,7 +22,7 @@ const { expect } = require('chai')
 const { ethers } = require('hardhat')
 const Constants = require('../../constants')
 
-describe('New tests', () => {
+describe('@solidityequiv1 New tests', () => {
   let newContract
   const CONTRACT_ALPHA = 'Alpha'
   const MESSAGE_ALPHA = 'Message from Alpha contract'
diff --git a/test/solidity/transaction/transaction.js b/test/solidity/transaction/transaction.js
index d3d97f2dd..f8264e5f5 100644
--- a/test/solidity/transaction/transaction.js
+++ b/test/solidity/transaction/transaction.js
@@ -23,7 +23,7 @@ const { ethers } = require('hardhat')
 const Constants = require('../../constants')
 const Utils = require('../../hts-precompile/utils')
 
-describe('Transaction tests', function () {
+describe('@solidityequiv1 Transaction tests', function () {
   let contractTr, contractTrAddr, wallet, mfContract, senderWalletAddr
 
   before(async function () {
diff --git a/test/solidity/units/cryptoUnits.js b/test/solidity/units/cryptoUnits.js
index 58be767ae..6284aec27 100644
--- a/test/solidity/units/cryptoUnits.js
+++ b/test/solidity/units/cryptoUnits.js
@@ -2,7 +2,7 @@ const { expect } = require('chai')
 const { ethers } = require('hardhat')
 const { WEI, GWEI } = require('../../constants')
 
-describe('Crypto Units tests', function () {
+describe('@solidityequiv3 Crypto Units tests', function () {
   let signers
   let contract
 
diff --git a/test/solidity/units/timeUnits.js b/test/solidity/units/timeUnits.js
index f7c7f26ec..3d4d5a178 100644
--- a/test/solidity/units/timeUnits.js
+++ b/test/solidity/units/timeUnits.js
@@ -2,7 +2,7 @@ const { expect } = require('chai')
 const { ethers } = require('hardhat')
 const { SECOND, MINUTE, HOUR, DAY, WEEK } = require('../../constants')
 
-describe('Time Units tests', function () {
+describe('@solidityequiv3 Time Units tests', function () {
   let signers
   let contract