diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 576c664..14be5e2 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -2,7 +2,7 @@ name: Lint & Test with Gradle
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
 
 jobs:
@@ -10,7 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: ['11', '17']
+        java-version:
+          - 17
+          - 21
 
     steps:
       - uses: actions/checkout@v4
@@ -18,8 +20,8 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java-version }}
-          distribution: 'adopt'
+          distribution: "adopt"
       - name: Lint
         run: gradle spotlessCheck
       - name: Build & Test
-        run: gradle test -x spotlessApply
+        run: gradle test -x spotlessApply --info
diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml
index 6017aba..d8a252c 100644
--- a/.github/workflows/mvn.yml
+++ b/.github/workflows/mvn.yml
@@ -2,7 +2,7 @@ name: Lint & Test with Maven
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
 
 jobs:
@@ -10,7 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: ['11', '17']
+        java-version:
+          - 11
+          - 17
+          - 21
 
     steps:
       - uses: actions/checkout@v4
@@ -18,7 +21,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java-version }}
-          distribution: 'adopt'
+          distribution: "adopt"
       - name: Lint
         run: mvn --batch-mode spotless:check
       - name: Build & Test
diff --git a/build.gradle b/build.gradle
index c442ed7..81ad70a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,8 @@ dependencies {
 	// ***** OAUTH DEPENDENCIES *****
 	implementation("com.slack.api:bolt-jetty:1.45.3")
 	// ***** TEST DEPENDENCIES *****
-	testImplementation('org.junit.jupiter:junit-jupiter-engine:5.13.4')
+	testImplementation('org.junit.jupiter:junit-jupiter-api:5.13.4')
+	testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.13.4')
 	testImplementation('org.mockito:mockito-core:5.18.0')
 }
 
@@ -30,8 +31,12 @@ application {
 	mainClass = 'Main'
 }
 
-tasks.named('test') {
-	useJUnit()
+testing {
+	suites {
+		test {
+			useJUnitJupiter()
+		}
+	}
 }
 
 spotless {