diff --git a/framework/.gitignore b/framework/.gitignore
new file mode 100644
index 0000000000..bf7e64e140
--- /dev/null
+++ b/framework/.gitignore
@@ -0,0 +1,3 @@
+/.gradle/
+/build/
+/gradle/
diff --git a/framework/build.gradle b/framework/build.gradle
new file mode 100644
index 0000000000..37ea39565b
--- /dev/null
+++ b/framework/build.gradle
@@ -0,0 +1,160 @@
+import org.yaml.snakeyaml.Yaml
+
+buildscript {
+    repositories {
+        maven {
+            url "https://repo.nos.to/content/repositories/central/"
+            credentials {
+                username = "$mavenUser"
+                password = "$mavenPassword"
+            }
+        }
+    }
+    dependencies {
+        classpath group: 'org.yaml', name: 'snakeyaml', version: '2.2'
+    }
+}
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+}
+
+group 'com.nosto.play'
+version '1.7.1-nosto-GA5-gradle-5'
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src']
+        }
+        resources {
+            srcDirs = ['src']
+        }
+    }
+    test {
+        java {
+            srcDirs = ['test-src']
+        }
+        resources {
+            srcDirs = ['test-src']
+        }
+
+        output.resourcesDir = "build/classes/java/test"
+    }
+}
+
+def deps = new Yaml().load(file("dependencies.yml").text)
+
+
+repositories {
+    mavenLocal()
+    maven {
+        url "https://repo.nos.to/content/repositories/central/"
+        credentials {
+            username = "$mavenUser"
+            password = "$mavenPassword"
+        }
+    }
+    maven {
+        url 'https://repo.nos.to/content/repositories/NostoDependencies/'
+        credentials {
+            username "$mavenUser"
+            password "$mavenPassword"
+        }
+    }
+}
+
+dependencies {
+    deps.require.each {
+        def lv = it.split(" ")
+        def version = lv[lv.size() - 1]
+        def lib = it.substring(0, it.length() - version.length()).split("->")
+        def group = lib[0]
+        def name = lib.size() > 1 ? lib[1] : group
+        implementation(group: group.trim(), name: name.trim(), version: version.trim(), {
+            transitive = false
+        })
+    }
+
+    // libs not listed in dependencies.yml, but required for compilation
+    compileOnly(group: 'org.apache.ant', name: 'ant', version: '1.10.14')
+    compileOnly(group: 'org.apache.ant', name: 'ant-junit', version: '1.10.14')
+    compileOnly group: 'com.google.code.maven-play-plugin.org.playframework', name: 'jj-simplecaptcha', version: '1.1'
+
+    testImplementation(group: 'junit', name: 'junit', version: '4.13.2')
+    testImplementation(group: 'org.apache.ant', name: 'ant', version: '1.10.14')
+    testImplementation(group: 'org.apache.ant', name: 'ant-junit', version: '1.10.14')
+    testImplementation(group: 'org.easytesting', name: 'fest-assert', version: '1.4')
+    testImplementation(group: 'org.easytesting', name: 'fest-util', version: '1.1.6')
+    testImplementation(group: 'org.mockito', name: 'mockito-core', version: '2.21.0')
+    testImplementation(group: 'org.objenesis', name: 'objenesis', version: '2.6')
+}
+
+jar {
+    manifest {
+        attributes 'Premain-Class': 'play.classloading.HotswapAgent',
+                'Can-Redefine-Classes': true,
+                'Built-JDK': System.getProperty('java.version'),
+                'Name': 'Play',
+                'Specification-Title': 'Play! framework'
+    }
+}
+
+task assembleRunscripts(type: Zip) {
+    archiveBaseName = 'play'
+    description "Assemble archive $archiveBaseName"
+    from("../play")
+    from("pym") {
+        into("framework/pym")
+    }
+
+    from("../modules/testrunner/lib") {
+        into("modules/testrunner/lib")
+    }
+}
+
+task copyDependencies(type: Copy) {
+    from configurations.runtimeClasspath
+    into "lib-gradle"
+}
+
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId "play"
+            from components.java
+        }
+        mavenZip(MavenPublication) {
+            artifactId "play-zip"
+            artifact assembleRunscripts
+        }
+        maven(MavenPublication) {
+            groupId = "com.nosto.play"
+            artifactId = "play-test"
+
+            pom {
+                name = "play-test"
+                withXml {
+                    def dependenciesNode = asNode().appendNode('dependencies')
+                    configurations.testImplementation.dependencies.each {
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('groupId', it.group)
+                        dependencyNode.appendNode('artifactId', it.name)
+                        dependencyNode.appendNode('version', it.version)
+                    }
+                }
+            }
+        }
+    }
+    repositories {
+        maven {
+            url 'https://repo.nos.to/content/repositories/NostoDependencies/'
+            credentials {
+                username "$mavenUser"
+                password "$mavenPassword"
+            }
+        }
+    }
+}
diff --git a/framework/dependencies.yml b/framework/dependencies.yml
index da2827a326..a0e7c57dc5 100644
--- a/framework/dependencies.yml
+++ b/framework/dependencies.yml
@@ -31,19 +31,19 @@ require:    &allDependencies
     - com.h2database -> h2 1.4.200
     - javax.activation -> javax.activation-api 1.2.0
     - com.sun.mail -> javax.mail 1.6.2
-    - javax.inject 1.0
+    - jakarta.inject -> jakarta.inject-api 1.0
     - javax.validation -> validation-api 1.1.0.Final
+    - javax.activation -> activation 1.1.1
     - jaxen 1.2.0
     - joda-time 2.11.1
     - org.hamcrest -> hamcrest-all 1.3
-    - junit 4.13.2
-    - jregex 1.2_01
-    - log4j-api 2.18.0
-    - log4j-core 2.18.0
+    - net.sourceforge.jregex -> jregex  1.2_01
+    - org.apache.logging.log4j -> log4j-api 2.18.0
+    - org.apache.logging.log4j -> log4j-core 2.18.0
     - net.sf.ehcache -> ehcache 2.10.9.2
     - net.sf.ezmorph -> ezmorph 1.0.6
     - net.sf.jsr107cache -> jsr107cache 1.1
-    - net.sf.oval -> oval 3.1.0
+    - net.sf.oval -> oval 3.2.1
     - oauth.signpost -> signpost-core 1.2.1.2
     - org.apache.geronimo.specs -> geronimo-servlet_2.5_spec 1.2
     - org.apache.ivy -> ivy 2.5.0
diff --git a/framework/gradlew b/framework/gradlew
new file mode 100755
index 0000000000..1aa94a4269
--- /dev/null
+++ b/framework/gradlew
@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/framework/gradlew.bat b/framework/gradlew.bat
new file mode 100644
index 0000000000..93e3f59f13
--- /dev/null
+++ b/framework/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/framework/lib/commons-collections-3.2.2.jar b/framework/lib/commons-collections-3.2.2.jar
deleted file mode 100644
index fa5df82a63..0000000000
Binary files a/framework/lib/commons-collections-3.2.2.jar and /dev/null differ
diff --git a/framework/lib/jakarta.inject-api-1.0.jar b/framework/lib/jakarta.inject-api-1.0.jar
new file mode 100644
index 0000000000..77ca714ab1
Binary files /dev/null and b/framework/lib/jakarta.inject-api-1.0.jar differ
diff --git a/framework/lib/javax.inject-1.0.jar b/framework/lib/javax.inject-1.0.jar
deleted file mode 100644
index 1ff61ceecf..0000000000
Binary files a/framework/lib/javax.inject-1.0.jar and /dev/null differ
diff --git a/framework/lib/oval-3.1.0.jar b/framework/lib/oval-3.1.0.jar
deleted file mode 100644
index 9cb2a94786..0000000000
Binary files a/framework/lib/oval-3.1.0.jar and /dev/null differ
diff --git a/framework/lib/oval-3.2.1.jar b/framework/lib/oval-3.2.1.jar
new file mode 100644
index 0000000000..d50a4b7267
Binary files /dev/null and b/framework/lib/oval-3.2.1.jar differ
diff --git a/framework/pym/play/commands/junit.py b/framework/pym/play/commands/junit.py
index c0e5a0c5a7..901e4d88d6 100644
--- a/framework/pym/play/commands/junit.py
+++ b/framework/pym/play/commands/junit.py
@@ -71,7 +71,12 @@ def junit(app, args):
         print("~ cleaning test results")
         shutil.rmtree(test_result)
     args.append('-Dplay.autotest')
-    java_cmd = app.java_cmd(args, className='play.test.Runner')
+
+    classpath = app.getClasspath()
+    if os.path.exists(os.path.join(app.path, 'lib-test')):
+        app.find_and_add_all_jars(classpath, os.path.join(app.path, 'lib-test'))
+
+    java_cmd = app.java_cmd(args, cp_args=':'.join(classpath), className='play.test.Runner')
     try:
         process = subprocess.Popen(java_cmd, env=os.environ)
         signal.signal(signal.SIGTERM, handle_sigterm)
@@ -83,4 +88,3 @@ def junit(app, args):
     except OSError:
         print("Could not execute the java executable, please make sure the JAVA_HOME environment variable is set properly (the java executable should reside at JAVA_HOME/bin/java). ")
         sys.exit(-1)
-
diff --git a/framework/src/play/test/Runner.java b/framework/src/play/test/Runner.java
index 61047c774e..2fb6b799d7 100644
--- a/framework/src/play/test/Runner.java
+++ b/framework/src/play/test/Runner.java
@@ -20,7 +20,7 @@ public static void main(String... args) {
         //noinspection ResultOfMethodCallIgnored
         new File("test-result").mkdirs();
 
-        TestRun testRun = TestRun.parse();
+        TestRun testRun = TestRun.parse(System.getProperty("tests", "all"));
         runner.addListener(new LoggingListener());
         runner.addListener(new XMLReportListener());
         Result result = runner.run(testRun.createRequest(defaultComputer()));
diff --git a/framework/src/play/test/TestRun.java b/framework/src/play/test/TestRun.java
index 82060e8c8f..9fefd9a540 100644
--- a/framework/src/play/test/TestRun.java
+++ b/framework/src/play/test/TestRun.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 import org.junit.runner.Computer;
 import org.junit.runner.Request;
@@ -14,10 +15,14 @@ public class TestRun {
          classes = new ArrayList<>();
     }
 
-    public static TestRun parse() {
+    public static TestRun parse(String filer) {
         TestRun result = new TestRun();
         result.classes.addAll(TestEngine.allUnitTests());
         result.classes.addAll(TestEngine.allFunctionalTests());
+        if (!"all".equals(filer) && filer != null && !filer.isEmpty()) {
+            String[] split = filer.split(",");
+            result.classes.removeIf(c -> Stream.of(split).noneMatch(prefix -> c.getName().startsWith(prefix)));
+        }
         return result;
     }
 
diff --git a/framework/src/play/test/junit/listeners/xmlout/DescriptionAsTest.java b/framework/src/play/test/junit/listeners/xmlout/DescriptionAsTest.java
index 5a537f88c6..c5064db8f0 100644
--- a/framework/src/play/test/junit/listeners/xmlout/DescriptionAsTest.java
+++ b/framework/src/play/test/junit/listeners/xmlout/DescriptionAsTest.java
@@ -1,13 +1,12 @@
 package play.test.junit.listeners.xmlout;
 
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter;
 import org.junit.runner.Description;
 
 import junit.framework.Test;
 import junit.framework.TestResult;
 
 /**
- * Wraps {@link Description} into {@link Test} enough to fake {@link JUnitResultFormatter}.
+ * Wraps {@link Description} into {@link Test} enough to fake {@link org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter}.
  */
 public class DescriptionAsTest implements Test {
     private final Description description;
@@ -25,7 +24,7 @@ public void run(TestResult result) {
     }
 
     /**
-     * {@link JUnitResultFormatter} determines the test name by reflection.
+     * {@link org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter} determines the test name by reflection.
      */
     public String getName() {
         return description.getDisplayName();