diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
index 4cc0bd5..e1eefb6 100644
--- a/.github/workflows/check-build.yml
+++ b/.github/workflows/check-build.yml
@@ -93,7 +93,7 @@ jobs:
         cache: 'gradle'
 
     - name: Run Checkstyle
-      run: ./gradlew checkstyleMain checkstyleTest -PcheckstyleEnabled=true
+      run: ./gradlew checkstyleMain checkstyleTest -PcheckstyleEnabled
 
   pmd:
     runs-on: ubuntu-latest
@@ -115,7 +115,7 @@ jobs:
         cache: 'gradle'
 
     - name: Run PMD
-      run: ./gradlew pmdMain pmdTest
+      run: ./gradlew pmdMain pmdTest -PpmdEnabled
 
     - name: Upload report
       if: always()
diff --git a/.run/Run Tests.run.xml b/.run/Run Tests.run.xml
index db611fc..257b7a5 100644
--- a/.run/Run Tests.run.xml	
+++ b/.run/Run Tests.run.xml	
@@ -5,7 +5,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PskipPMD" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
diff --git a/build.gradle b/build.gradle
index c2f4207..1845426 100644
--- a/build.gradle
+++ b/build.gradle
@@ -121,7 +121,7 @@ tasks.withType(Checkstyle).configureEach {
 }
 
 tasks.withType(Pmd).configureEach {
-    enabled = !project.hasProperty("skipPMD")
+    enabled = project.hasProperty("pmdEnabled")
 }
 
 // Configure compileJava AND compileTestJava