diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..d1faa89f
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,96 @@
+name: Run Tests
+on: [ push, pull_request ]
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        gradle: [ 7.0.1 ]
+        java: [ jdk16 ]
+        jvm: [ hotspot ]
+    runs-on: ubuntu-20.04
+    container:
+      image: gradle:${{ matrix.gradle }}-${{ matrix.java }}
+      options: --user root
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
+      - run: gradle build check -x test --stacktrace
+
+  # This job is used to feed the test matrix of next job to allow the tests to run in parallel
+  prepare_test_matrix:
+    # Lets wait to ensure it builds before going running tests
+    needs: build
+
+    runs-on: ubuntu-20.04
+    container:
+      image: gradle:7.0.1-jdk16
+      options: --user root
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: gradle writeActionsTestMatrix --stacktrace
+      - id: set-matrix
+        run: echo "::set-output name=matrix::$(cat build/test_matrix.json)"
+
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+
+  run_tests:
+    needs: prepare_test_matrix
+
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ jdk16 ]
+        test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
+        exclude:
+          - java: jdk16
+            test: net.fabricmc.loom.test.integration.KotlinTest
+
+    runs-on: ubuntu-20.04
+    container:
+      image: gradle:7.0.0-${{ matrix.java }}
+      options: --user root
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: gradle test --tests ${{ matrix.test }} --stacktrace
+        env:
+          TEST_WARNING_MODE: fail
+
+      - uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: ${{ matrix.test }} (${{ matrix.java }}) Results
+          path: build/reports/
+
+  run_tests_windows:
+    needs: prepare_test_matrix
+
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 16 ]
+        test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
+        exclude:
+          - java: 16
+            test: net.fabricmc.loom.test.integration.KotlinTest
+
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - run: ./gradlew test --tests ${{ matrix.test }} --stacktrace
+        env:
+          TEST_WARNING_MODE: fail
+
+      - uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: ${{ matrix.test }} (${{ matrix.java }}) Results
+          path: build/reports/
diff --git a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
index 8636579a..62935326 100644
--- a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
@@ -25,7 +25,6 @@
 package net.fabricmc.loom.configuration;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
@@ -34,7 +33,6 @@ import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.UnknownTaskException;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.bundling.AbstractArchiveTask;
 import org.gradle.api.tasks.bundling.Jar;
 import org.jetbrains.annotations.ApiStatus;
diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
index 53a5b3e2..addc6f49 100644
--- a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
@@ -41,7 +41,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             }
             def layers = spec.layers()
         then:
-            spec.version == "layered+hash.961"
+            spec.version == "layered+hash.2198"
             layers.size() == 2
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -56,7 +56,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.863714404"
+            spec.version == "layered+hash.863752751"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -76,7 +76,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.863714410"
+            spec.version == "layered+hash.863752757"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -96,7 +96,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.1144465487"
+            spec.version == "layered+hash.1144427140"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec