diff --git a/test/src/main/java/com/gargoylesoftware/htmlunit/README.md b/test/src/main/java/com/gargoylesoftware/htmlunit/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..4d65cfdcc2643c151009cad9610dc66d5b843d97
--- /dev/null
+++ b/test/src/main/java/com/gargoylesoftware/htmlunit/README.md
@@ -0,0 +1,39 @@
+# Overview
+Jenkins used to maintain a forked version of HtmlUnit and use it via `JenkinsRule` (and `HudsonTestCase`). Moving
+away from the forked version has allowed Jenkins GUI to start using more modern JavaScript libraries than were
+possible through the forked version.
+
+Moving away from the forked version also means that some tests in plugins may no longer compile due to the
+fact that they were using some methods that were added to the fork, but not available in the mainstream HtmlUnit.
+To help with that, the test harness now provides static utilities for all of this functionality.
+
+# WebClientUtil
+The `WebClientUtil` class provides static utilities for interacting asynchronously with HtmlUnit's `WebClient`,
+supporting `waitForJSExec` calls to allow your test code wait for background (asynchronous) JavaScript code to complete
+before the test continues. Calling these methods are not required in many cases as they are called for you from
+other static utilities (e.g. `HtmlFormUtil.submit`), but sometimes it is required to call them directly.
+
+Because HtmlUnit executes JavaScript asynchronously, it's usually not possible to block and catch exceptions. For
+that reason, `WebClientUtil` provides the `addExceptionListener` utility as a way of registering an exception listener.
+This typically needs to be used in conjunction with the `waitForJSExec` method e.g.
+
+```
+WebClient webClient = jenkinsRule.createWebClient();
+WebClientUtil.ExceptionListener exceptionListener = WebClientUtil.addExceptionListener(webClient);
+
+// Interact with Jenkins UI as normal in a test...
+
+// Make sure all background JavaScript has completed so as expected exceptions have been thrown.
+WebClientUtil.waitForJSExec(webClient);
+
+// Now we can check for exceptions etc...
+exceptionListener.assertHasException();
+ScriptException e = exceptionListener.getScriptException();
+Assert.assertTrue(e.getMessage().contains("simulated error"));
+```
+
+# HtmlElementUtil, HtmlFormUtil and DomNodeUtil 
+These classes provide static utility methods to replace functionality that was added to the forked HtmlUnit e.g.
+for triggering `<form>` submit, triggering a click event on an element etc.
+
+Use your IDE to access these utility classes and the static methods available.
\ No newline at end of file
diff --git a/test/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFormUtil.java b/test/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFormUtil.java
index 2ebebc0b862246bcdf60c7d30290081fa84ff9b4..af95c37cdf18c34eb5620d3574da18c925aaf77f 100644
--- a/test/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFormUtil.java
+++ b/test/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFormUtil.java
@@ -33,6 +33,9 @@ import java.util.List;
 
 /**
  * {@link HtmlForm} helper functions.
+ * <p>
+ * In many cases, the methods defined here replace methods of the same name that were
+ * added to the {@link HtmlForm} class on the old forked version of HtmlUnit.
  * 
  * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
  */