diff --git a/WHATSNEW b/WHATSNEW
index b3775380a..e8fc11726 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -175,7 +175,13 @@ Fixed bugs:
 
  * <parallel> could allow tasks to start executing even if a task
    scheduled to run before them timed out.
-   Bugzilla Report 49527
+   Bugzilla Report 49527.
+
+ * If a <junit> batch with multiple tests times out Ant logs a message
+   about a test named Batch-With-Multiple-Tests since 1.8.0 but the
+   logic that determined the Java package of this pseudo-test has been
+   wrong.
+   Bugzilla Report 45227.
 
 Other changes:
 --------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 9a977310b..01aa0053b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -2057,7 +2057,7 @@ public class JUnitTask extends Task {
      */
     private static JUnitTest createDummyTestForBatchTest(JUnitTest test) {
         JUnitTest t = (JUnitTest) test.clone();
-        int index = test.getName().indexOf('.');
+        int index = test.getName().lastIndexOf('.');
         // make sure test looks as if it was in the same "package" as
         // the last test of the batch
         String pack = index > 0 ? test.getName().substring(0, index + 1) : "";
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
index 7755bf5ac..0741789f6 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
@@ -24,9 +24,10 @@
 
   <macrodef name="empty-test">
     <attribute name="classname"/>
+    <attribute name="package" default="test"/>
     <sequential>
       <echo file="${input}/@{classname}.java"><![CDATA[
-package test;
+package @{package};
 import junit.framework.TestCase;
 
 public class @{classname} extends TestCase {
@@ -44,9 +45,9 @@ public class @{classname} extends TestCase {
   <target name="testTimeoutLogOfBatchTests">
     <mkdir dir="${input}"/>
     <mkdir dir="${output}"/>
-    <empty-test classname="ATest"/>
+    <empty-test classname="ATest" package="org.apache.ant.test"/>
       <echo file="${input}/BTest.java"><![CDATA[
-package test;
+package org.apache.ant.test;
 import junit.framework.TestCase;
 
 public class BTest extends TestCase {
@@ -55,8 +56,8 @@ public class BTest extends TestCase {
     }
 }
 ]]>  </echo>
-    <empty-test classname="CTest"/>
-    <empty-test classname="DTest"/>
+    <empty-test classname="CTest" package="org.apache.ant.test"/>
+    <empty-test classname="DTest" package="org.apache.ant.test"/>
     <javac srcdir="${input}" destdir="${output}">
       <classpath refid="junit"/>
     </javac>
@@ -71,6 +72,7 @@ public class BTest extends TestCase {
     </junit>
     <au:assertLogContains text="ATest"/>
     <au:assertLogContains text="BTest"/>
+    <au:assertLogContains text="org.apache.ant.test.Batch-With-Multiple-Tests"/>
     <au:assertLogDoesntContain text="CTest"/>
     <au:assertLogDoesntContain text="DTest"/>
   </target>