diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml
index d83c9199d..926e60e30 100644
--- a/.github/workflows/gradle.yaml
+++ b/.github/workflows/gradle.yaml
@@ -42,7 +42,7 @@ jobs:
         run: ./gradlew spotlessCheck
 
       - name: Test with Gradle
-        run: ./gradlew test
+        run: ./gradlew :server:core:test :server:desktop:test
 
   build:
     runs-on: ubuntu-latest
@@ -65,7 +65,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v5
 
       - name: Build with Gradle
-        run: ./gradlew shadowJar
+        run: ./gradlew :server:desktop:shadowJar
 
       - name: Upload the Server JAR as a Build Artifact
         uses: actions/upload-artifact@v5
diff --git a/server/android/build.gradle.kts b/server/android/build.gradle.kts
index b2620bb00..e2157cd51 100644
--- a/server/android/build.gradle.kts
+++ b/server/android/build.gradle.kts
@@ -43,9 +43,9 @@ tasks.preBuild {
 	// Validate release keystore
 	val storeFile = android.buildTypes.getByName("release").signingConfig?.storeFile
 	if (storeFile?.isFile != true) {
-		throw GradleException("KeyStore file does not exist or is not a file: ${storeFile?.path}")
+		throw GradleException("Android KeyStore file does not exist or is not a file: ${storeFile?.path}")
 	} else if (storeFile.length() <= 0) {
-		throw GradleException("KeyStore file is empty: ${storeFile.path}")
+		throw GradleException("Android KeyStore file is empty: ${storeFile.path}")
 	}
 }