diff --git a/buildSrc/quality/pmd.xml b/buildSrc/quality/pmd.xml
index 1d49f901..5e0e88e3 100644
--- a/buildSrc/quality/pmd.xml
+++ b/buildSrc/quality/pmd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  ~ Copyright 2025, TeamDev. All rights reserved.
+  ~ Copyright 2026, TeamDev. All rights reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -60,10 +60,10 @@
     <rule ref="category/java/codestyle.xml/ControlStatementBraces"/>
     <rule ref="category/java/codestyle.xml/ExtendsObject"/>
     <rule ref="category/java/codestyle.xml/FieldDeclarationsShouldBeAtStartOfClass"/>
-    <rule ref="category/java/codestyle.xml/GenericsNaming"/>
     <rule ref="category/java/codestyle.xml/MethodNamingConventions"/>
     <rule ref="category/java/codestyle.xml/NoPackage"/>
     <rule ref="category/java/codestyle.xml/PackageCase"/>
+    <rule ref="category/java/codestyle.xml/TypeParameterNamingConventions"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
 
diff --git a/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/GradleTaskTest.kt b/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/GradleTaskTest.kt
index eeec002d..bfb583d6 100644
--- a/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/GradleTaskTest.kt
+++ b/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/GradleTaskTest.kt
@@ -45,7 +45,7 @@ class GradleTaskTest {
     @Test
     fun `create an instance from an existing Gradle task`() {
         val project = ProjectBuilder.builder().build()
-        val task = project.tasks.create("existingTask")
+        val task = project.tasks.register("existingTask").get()
 
         val gradleTask = GradleTask.from(task)
 
@@ -58,7 +58,7 @@ class GradleTaskTest {
     @Test
     fun `provide a string representation`() {
         val project = ProjectBuilder.builder().build()
-        val task = project.tasks.create("aTask")
+        val task = project.tasks.register("aTask").get()
 
         GradleTask.from(task).toString() shouldContain "GradleTask"
     }
@@ -66,8 +66,8 @@ class GradleTaskTest {
     @Test
     fun `support equality`() {
         val project = ProjectBuilder.builder().build()
-        val taskA = project.tasks.create("taskA")
-        val taskB = project.tasks.create("taskB")
+        val taskA = project.tasks.register("taskA").get()
+        val taskB = project.tasks.register("taskB").get()
 
         EqualsTester()
             .addEqualityGroup(GradleTask.from(taskA), GradleTask.from(taskA))
diff --git a/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/TaskDependenciesSpec.kt b/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/TaskDependenciesSpec.kt
index 5241cf3d..5e289285 100644
--- a/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/TaskDependenciesSpec.kt
+++ b/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/TaskDependenciesSpec.kt
@@ -43,8 +43,8 @@ internal class TaskDependenciesSpec {
     @BeforeEach
     fun setUp() {
         val project = ProjectBuilder.builder().build()
-        ontoTask = project.tasks.create("ontoTask")
-        task = project.tasks.create("dependent")
+        ontoTask = project.tasks.register("ontoTask").get()
+        task = project.tasks.register("dependent").get()
     }
 
     @Test