diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0cf2c68..5077a2a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,5 +50,23 @@ jobs:
       - name: Build Assets
         run: npm run build
 
+      - name: Setup Test RSA Keys
+        run: |
+          echo "Setting up test RSA keys..."
+          mkdir -p storage/testing/oauth
+          php artisan app:generate-keys --path="storage/testing/oauth"
+          echo "✅ Test keys generated"
+
       - name: Run Tests
-        run: ./vendor/bin/pest
\ No newline at end of file
+        run: ./vendor/bin/pest
+
+      - name: Cleanup Test Keys
+        if: always()
+        run: |
+          echo "Cleaning up test RSA keys..."
+          if [ -d "storage/testing" ]; then
+            rm -rf storage/testing
+            echo "✅ Test storage directory cleaned up"
+          else
+            echo "ℹ️ No test storage directory found to clean up"
+          fi
\ No newline at end of file
diff --git a/scripts/setup-test-keys.sh b/scripts/setup-test-keys.sh
deleted file mode 100755
index d3823eb..0000000
--- a/scripts/setup-test-keys.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# Script to set up test RSA keys for CI/CD environments
-# This ensures tests run with proper keys without affecting production keys
-
-set -e
-
-# Define the test key directory
-TEST_KEY_DIR="storage/testing/oauth"
-
-# Function to generate test keys
-generate_test_keys() {
-    echo "Setting up test RSA keys..."
-    
-    # Create test directory if it doesn't exist
-    mkdir -p "$TEST_KEY_DIR"
-    
-    # Generate test keys using artisan command
-    php artisan app:generate-keys --path="$TEST_KEY_DIR"
-    
-    echo "✅ Test keys generated in $TEST_KEY_DIR"
-}
-
-# Function to clean up test keys
-cleanup_test_keys() {
-    echo "Cleaning up test RSA keys..."
-    
-    if [ -d "$TEST_KEY_DIR" ]; then
-        rm -rf "$TEST_KEY_DIR"
-        echo "✅ Test keys cleaned up"
-    else
-        echo "ℹ️  No test keys found to clean up"
-    fi
-}
-
-# Main script logic
-case "${1:-setup}" in
-    "setup")
-        generate_test_keys
-        ;;
-    "cleanup")
-        cleanup_test_keys
-        ;;
-    "reset")
-        cleanup_test_keys
-        generate_test_keys
-        ;;
-    *)
-        echo "Usage: $0 [setup|cleanup|reset]"
-        echo "  setup   - Generate test keys (default)"
-        echo "  cleanup - Remove test keys"
-        echo "  reset   - Remove and regenerate test keys"
-        exit 1
-        ;;
-esac
\ No newline at end of file