diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
index f553ea2d..aed501ce 100644
--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -3,7 +3,7 @@ name: Test PR
 on:
   pull_request:
     branches:
-        - main
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref }}
@@ -26,7 +26,7 @@ env:
   MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
 
 jobs:
-  test_pr:
+  test:
     name: Test PR
     runs-on: ${{ matrix.os }}
     strategy:
diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml
index 1a6c4370..336264ea 100644
--- a/.github/workflows/test-smoke.yml
+++ b/.github/workflows/test-smoke.yml
@@ -1,38 +1,67 @@
-name: Smoke Test
+name: Smoke Tests
 
 on:
   schedule:
     - cron: "0 4 * * *"
   pull_request:
-    branches:
-      - main
     paths:
       - "spec/smoke/*"
+      - ".github/workflows/test-smoke.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 
 env:
-  BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
   BW_USERNAME: ${{ secrets.BW_USERNAME }}
   BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
   BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
   BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
-  BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
-  BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
-  BW_NUMBER: ${{ secrets.BW_NUMBER }}
   USER_NUMBER: ${{ secrets.USER_NUMBER }}
   BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
-  MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
-  MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
   MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
-  MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
 
 jobs:
-  test_main:
+  test:
     name: Smoke Test
     runs-on: ubuntu-latest
+    env:
+      BW_NUMBER: ${{ secrets.BW_NUMBER }}
+      BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
+      BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
+      BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
+      MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
+      MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
+      MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+
+      - name: Install Packages and Test
+        run: |
+          bundle install
+          rake smoke
+        env:
+          RUBY_VERSION: 3.3
+          OPERATING_SYSTEM: ubuntu
+        shell: bash
+
+  test_up:
+    name: Smoke Test UP Account
+    runs-on: ubuntu-latest
+    env:
+      BW_NUMBER: ${{ secrets.BW_UP_NUMBER }}
+      BW_ACCOUNT_ID: ${{ secrets.BW_UP_ACCOUNT_ID }}
+      BW_VOICE_APPLICATION_ID: ${{ secrets.BW_UP_VOICE_APPLICATION_ID }}
+      BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_UP_MESSAGING_APPLICATION_ID }}
+      MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_UP_ACTIVE_NUMBER }}
+      MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_UP_IDLE_NUMBER }}
+      MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_UP_APPLICATION_ID }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -53,7 +82,7 @@ jobs:
 
   notify_for_failures:
     name: Notify for Failures
-    needs: [test_main]
+    needs: [test, test_up]
     if: failure()
     runs-on: ubuntu-latest
     steps: