diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml
new file mode 100644
index 0000000..ac8c570
--- /dev/null
+++ b/.github/workflows/bleeding-edge.yml
@@ -0,0 +1,46 @@
+name: Bleeding Edge dependencies
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+  schedule:
+    - cron:  '0 0 * * 5'
+
+env:
+  INSTALL_EDM_VERSION: 3.2.3
+
+jobs:
+
+  # Test against EDM packages
+  test-bleeding-edge:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache EDM packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache
+          key: ${{ runner.os }}-${{ hashFiles('etstool.py') }}
+      - name: Set up EDM
+        uses: enthought/setup-edm-action@v1
+        with:
+          edm-version: ${{ env.INSTALL_EDM_VERSION }}
+      - name: Install click to the default EDM environment
+        run: edm install -y wheel click coverage
+      - name: Install test environment
+        run: edm run -- python etstool.py install
+      - name: Remove dependencies obtanied with edm
+        run: |
+            edm plumbing remove-package --force traits
+            edm plumbing remove-package --force scipy
+      - name: Re-install dependencies using pip
+        run: |
+            edm run -- python -m pip install --force-reinstall "git+http://github.com/enthought/traits.git#egg=traits"
+            edm run -- python -m pip install --force-reinstall scipy
+      - name: Run tests
+        uses: GabrielBB/xvfb-action@v1
+        with:
+          run: edm run -- python etstool.py test
diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml
index f1e6665..4493a07 100644
--- a/.github/workflows/test-with-edm.yml
+++ b/.github/workflows/test-with-edm.yml
@@ -1,6 +1,8 @@
 name: Test with EDM
 
 on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
   pull_request:
   schedule:
     - cron:  '0 0 * * 5'
@@ -22,7 +24,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.cache
-          key: ${{ runner.os }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
+          key: ${{ runner.os }}-${{ hashFiles('etstool.py') }}
       - name: Set up EDM
         uses: enthought/setup-edm-action@v1
         with: