diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index b6e2394..809b3db 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -43,9 +43,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Remove installed dotnet versions
+      - name: Clear toolcache
         shell: pwsh
-        run: __tests__/clear-installed-dotnet.ps1 ${{ runner.os }}
+        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
       # Side-by-side install of 2.2 and 3.1 used for the test project
       - name: Setup dotnet 2.2.402
         uses: ./
@@ -66,10 +66,19 @@ jobs:
         if: runner.os == 'windows'
         run: __tests__/verify-dotnet.ps1 3.1.201 2.2.402
 
-      # 2.0, 3.0, 5.0 needs to be in single quotes to interpret as a string instead of as an integer
-      - name: Remove installed dotnet versions
+  test-v2:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-latest, macOS-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Clear toolcache
         shell: pwsh
-        run: __tests__/clear-installed-dotnet.ps1 ${{ runner.os }}
+        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
+      # 2.0, 3.0, 5.0 needs to be in single quotes to interpret as a string instead of as an integer
       - name: Setup dotnet '3.1'
         uses: ./
         with:
@@ -80,11 +89,20 @@ jobs:
       - name: Verify dotnet (Windows)
         if: runner.os == 'windows'
         run: __tests__/verify-dotnet.ps1 3.1
-      
+  
+  test-v3:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-latest, macOS-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
       # Dotnet .x version install
-      - name: Remove installed dotnet versions
+      - name: Clear toolcache
         shell: pwsh
-        run: __tests__/clear-installed-dotnet.ps1 ${{ runner.os }}
+        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
       - name: Setup dotnet 3.1.x
         uses: ./
         with:
@@ -96,10 +114,19 @@ jobs:
         if: runner.os == 'windows'
         run: __tests__/verify-dotnet.ps1 3.1
 
+  test-v4:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-latest, macOS-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
       # Dotnet .* version install
-      - name: Remove installed dotnet versions
+      - name: Clear toolcache
         shell: pwsh
-        run: __tests__/clear-installed-dotnet.ps1 ${{ runner.os }}
+        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
       - name: Setup dotnet 3.1.*
         uses: ./
         with:
diff --git a/__tests__/clear-installed-dotnet.ps1 b/__tests__/clear-toolcache.ps1
similarity index 100%
rename from __tests__/clear-installed-dotnet.ps1
rename to __tests__/clear-toolcache.ps1