diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 87d9c5db..eb87209d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -25,9 +25,22 @@ jobs:
         cargo build --verbose
         cargo test --verbose
 
-    - name: Build and Test Sample Pop Server
+    - name: Build and Test Did Endpoint
       run: |
-        cd sample-pop-server
+        cd did-endpoint
+        cargo build --verbose
+        cargo test --verbose
+
+    - name: Build and Test Generic Server
+      run: |
+        cd generic-server
+        cargo build --verbose
+        cargo run --bin didgen
+        cargo test --verbose
+
+    - name: Build and Mediator Server
+      run: |
+        cd mediator-server
         cargo build --verbose
         cargo run --bin didgen
         cargo test --verbose
diff --git a/run_test.sh b/run_test.sh
new file mode 100755
index 00000000..12d693f5
--- /dev/null
+++ b/run_test.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+for dir in ./did-utils/ ./did-endpoint/ ./generic-server/ ./mediator-server/
+do
+  cd "${dir}"
+  if [ -f Cargo.toml ]; then
+    echo "Running tests in: ${dir}"
+    cargo test
+  fi
+  cd ..
+done
\ No newline at end of file