diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 9e2e27f40..000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-task:
-  name: Tests (linux)
-  container:
-    image: ubuntu:latest
-  install_script:
-    - apt-get update
-    - apt-get -y install python3 python3-venv python3-dev g++
-  test_script: 
-    - bash ./pytest.sh
-
-
-task:
-  name: Tests (macOS)
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
-  script: 
-    - sh ./pytest.sh
-
-
-
diff --git a/.github/workflows/cuda_test.yml b/.github/workflows/cuda_test.yml
deleted file mode 100644
index 1d727b2f1..000000000
--- a/.github/workflows/cuda_test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Launch test on a cuda machine
-name: Cuda test
-
-on:
-  push
-
-jobs:
-  test:
-    runs-on: self-hosted
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@v2
-      - name: Test with pytest
-        run: |
-          sh ./pytest.sh
diff --git a/.github/workflows/black.yml b/.github/workflows/lint.yml
similarity index 87%
rename from .github/workflows/black.yml
rename to .github/workflows/lint.yml
index 69934f854..686473ec3 100644
--- a/.github/workflows/black.yml
+++ b/.github/workflows/lint.yml
@@ -1,6 +1,6 @@
 name: Lint
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   lint:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..5568639ad
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,36 @@
+# Launch test on various platforms
+name: Test
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened, closed]
+    branches: ['main']
+  workflow_dispatch:
+
+jobs:
+  test-self-hosted:
+    runs-on: self-hosted
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v2
+      - name: Test with pytest
+        run: |
+          sh ./pytest.sh
+
+  test-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v2
+      - name: Test with pytest
+        run: |
+          sh ./pytest.sh
+
+  test-macos:
+    runs-on: macOS-latest
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v2
+      - name: Test with pytest
+        run: |
+          sh ./pytest.sh