diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index d146870ab3..cf48ab3783 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -37,6 +37,7 @@ Being based on a proper Antlr grammar, CPD can:
 
 *   all
     *   [#1788](https://github.com/pmd/pmd/issues/1788): \[cpd] \[core] Use better `ClassLoader` for `ServiceLoader` in `LanguageFactory`
+    *   [#1515](https://github.com/pmd/pmd/issues/1515): \[core] Module pmd-lang-test is missing javadoc artifact
 *   go
     *   [#1751](https://github.com/pmd/pmd/issues/1751): \[go] Parsing errors encountered with escaped backslash
 *   java
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index 005b1daf88..318bd9042f 100644
--- a/pmd-lang-test/pom.xml
+++ b/pmd-lang-test/pom.xml
@@ -16,6 +16,7 @@
     </parent>
 
     <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <plugins>
             <!-- The kotlin plugin has to run before the java plugin-->
             <plugin>
@@ -29,15 +30,54 @@
                             <goal>compile</goal>
                         </goals>
                         <phase>process-sources</phase>
-                        <configuration>
-                            <sourceDirs>
-                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-                                <sourceDir>${project.basedir}/src/main/java</sourceDir>
-                            </sourceDirs>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <!-- disable this execution, as we are using dokka-maven-plugin here -->
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+              <groupId>org.jetbrains.dokka</groupId>
+              <artifactId>dokka-maven-plugin</artifactId>
+              <version>${dokka.version}</version>
+              <executions>
+                  <execution>
+                      <phase>package</phase>
+                      <goals>
+                          <!--
+                            once https://github.com/Kotlin/dokka/issues/294 is fixed, use goal javadocJar instead
+                            and remove the additional jar plugin execution
+                           -->
+                          <goal>dokka</goal>
+                      </goals>
+                  </execution>
+              </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+                <execution>
+                    <id>kotlin-javadoc</id>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>jar</goal>
+                    </goals>
+                    <configuration>
+                        <classesDirectory>${project.build.directory}/dokka</classesDirectory>
+                        <classifier>javadoc</classifier>
+                    </configuration>
+                </execution>
+            </executions>
+          </plugin>
         </plugins>
     </build>
 
diff --git a/pmd-lang-test/src/main/java/net/sourceforge/pmd/lang/ast/test/PlaceHolder.java b/pmd-lang-test/src/main/java/net/sourceforge/pmd/lang/ast/test/PlaceHolder.java
deleted file mode 100644
index e45609fc3d..0000000000
--- a/pmd-lang-test/src/main/java/net/sourceforge/pmd/lang/ast/test/PlaceHolder.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.ast.test;
-
-/**
- * Hack to generate package javadoc.
- * See: https://stackoverflow.com/questions/1138390/javadoc-for-package-info-java-only
- */
-@Deprecated
-public class PlaceHolder {
-}
diff --git a/pmd-lang-test/src/main/java/net/sourceforge/pmd/lang/ast/test/package-info.java b/pmd-lang-test/src/main/java/net/sourceforge/pmd/lang/ast/test/package-info.java
deleted file mode 100644
index f648abb279..0000000000
--- a/pmd-lang-test/src/main/java/net/sourceforge/pmd/lang/ast/test/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-/**
- * Contains the Kotlin-based DSL to test AST nodes.
- */
-package net.sourceforge.pmd.lang.ast.test;
diff --git a/pom.xml b/pom.xml
index 01188c6079..227ecca1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,6 +266,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
 
         <kotlin.compiler.jvmTarget>${maven.compiler.test.target}</kotlin.compiler.jvmTarget>
         <kotlin.version>1.2.61</kotlin.version>
+        <dokka.version>0.9.18</dokka.version>
 
 
         <javacc.version>5.0</javacc.version>
@@ -1009,6 +1010,11 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
+        <pluginRepository>
+            <id>jcenter</id>
+            <name>JCenter</name>
+            <url>https://jcenter.bintray.com/</url>
+        </pluginRepository>
     </pluginRepositories>
 
     <profiles>