diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 53caa28..79dd9fd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,13 +15,17 @@ jobs:
       matrix:
         phpVersion: ['8.0', '8.1']
         winterRelease: ['develop']
+        winterReleaseDir: ['develop']
         include:
           - phpVersion: '7.2'
             winterRelease: 'v1.1.9'
+            winterReleaseDir: '1.1.9'
           - phpVersion: '7.3'
             winterRelease: 'v1.1.9'
+            winterReleaseDir: '1.1.9'
           - phpVersion: '7.4'
             winterRelease: 'v1.1.9'
+            winterReleaseDir: '1.1.9'
       fail-fast: false
     env:
       phpExtensions: mbstring, intl, gd, xml, sqlite
@@ -59,11 +63,11 @@ jobs:
       - name: Install Winter CMS
         run: |
           wget https://github.com/wintercms/winter/archive/${{ matrix.winterRelease }}.zip
-          unzip ${{ matrix.winterRelease }}.zip
-          rm ${{ matrix.winterRelease }}.zip
+          unzip ${{ matrix.winterReleaseDir }}.zip
+          rm ${{ matrix.winterReleaseDir }}.zip
           shopt -s dotglob
-          mv winter-${{ matrix.winterRelease }}/* ./
-          rmdir winter-${{ matrix.winterRelease }}
+          mv winter-${{ matrix.winterReleaseDir }}/* ./
+          rmdir winter-${{ matrix.winterReleaseDir }}
           shopt -u dotglob
           cp config/cms.php config/testing/cms.php
           mkdir -p plugins/winter
diff --git a/tests/UserPluginTestCase.php b/tests/UserPluginTestCase.php
index 92f0eb6..9fa28f6 100644
--- a/tests/UserPluginTestCase.php
+++ b/tests/UserPluginTestCase.php
@@ -1,11 +1,20 @@
 <?php namespace Winter\User\Tests;
 
 use App;
-use PluginTestCase;
 use Illuminate\Foundation\AliasLoader;
 use Winter\User\Models\Settings;
 
-abstract class UserPluginTestCase extends PluginTestCase
+if (class_exists('System\Tests\Bootstrap\PluginTestCase')) {
+    class BaseTestCase extends \System\Tests\Bootstrap\PluginTestCase
+    {
+    }
+} else {
+    class BaseTestCase extends \PluginTestCase
+    {
+    }
+}
+
+abstract class UserPluginTestCase extends BaseTestCase
 {
     /**
      * @var array   Plugins to refresh between tests.