diff --git a/.github/workflows/scala2.yml b/.github/workflows/scala2.yml
index f182d0c..4f351c2 100644
--- a/.github/workflows/scala2.yml
+++ b/.github/workflows/scala2.yml
@@ -8,14 +8,17 @@ on:
 
 jobs:
   build:
-
+    strategy:
+      fail-fast: false
+      matrix:
+        scala: ["2.12.12", "2.11.12"]
+        spark: ["2.4.0", "3.0.0"]
+        exclude:
+          - scala: "2.11.12"
+            spark: "3.0.0"
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Run tests
-      run: sbt test
+      - uses: actions/checkout@v1
+      - uses: olafurpg/setup-scala@v5
+      - name: Test
+        run: sbt -Dspark.version=${{ matrix.spark  }} ++${{ matrix.scala }} test
diff --git a/build.sbt b/build.sbt
index 30a2b53..5ef0143 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,10 +4,10 @@ organization := "com.microsoft.sqlserver.jdbc.spark"
 
 version := "1.0.0"
 
-scalaVersion := "2.12.11"
-ThisBuild / useCoursier := false
-val sparkVersion = "3.0.0"
+crossScalaVersions := Seq("2.12.12", "2.11.12")
+scalaVersion := crossScalaVersions.value.head
 
+val sparkVersion = sys.props.get("spark.version").getOrElse("3.0.0")
 javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
 
 libraryDependencies ++= Seq(