diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index 8b2c9d21..4acc66bc 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -68,6 +68,9 @@ jobs:
           - targetPlatform: StandaloneWindows64
             runs-on: [self-hosted, windows]
             test_script: test_windows.ps1
+          - targetPlatform: Android
+            runs-on: [ self-hosted, macOS ]
+            test_script: pytest test/test_android.py
     concurrency:
       group: test-${{ matrix.targetPlatform }}
     runs-on: ${{ matrix.runs-on }}
@@ -89,6 +92,8 @@ jobs:
           UNITY_APP_PATH: SampleApp.app
           UNITY_APP_NAME: SampleApp
           MAILSLURP_API_KEY: ${{ secrets.MAILSLURP_API_KEY }}
+          BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
         working-directory: sample/Tests
-        run: ./${{ matrix.test_script }}
+        run: ${{ matrix.test_script }}
       
\ No newline at end of file
diff --git a/sample/Tests/browserstack.yml b/sample/Tests/browserstack.yml
index ca518b0b..46de0c69 100644
--- a/sample/Tests/browserstack.yml
+++ b/sample/Tests/browserstack.yml
@@ -26,7 +26,7 @@ source: pytest-browserstack:sample-sdk:v1.0
 # Set `app` to define the app that is to be used for testing.
 # It can either take the id of any uploaded app or the path of the app directly.
 #app: ./WikipediaSample.apk
-app: ./build/output/Android/SampleApp.apk #For running local tests
+app: SampleApp.apk #For running local tests
 
 # =======================================
 # Platforms (Browsers / Devices to test)
diff --git a/sample/Tests/test/test_android.py b/sample/Tests/test/test_android.py
index 60c2407d..5f543e83 100644
--- a/sample/Tests/test/test_android.py
+++ b/sample/Tests/test/test_android.py
@@ -36,11 +36,6 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         print("\nEnding")
-        try:
-            AltReversePortForwarding.remove_reverse_port_forwarding_android()
-            print("Reverse port forwarding removed")
-        except:
-            print("No adb forward was present")
         cls.altdriver.stop()
         cls.appium_driver.quit()