org.jboss.test.spring.test.SpringClusterTestCase failing with IBM JDK 1.5

org.jboss.test.spring.test.SpringClusterTestCase is failing with this message:
testStandalone Failure N/A
junit.framework.AssertionFailedError
at org.jboss.test.spring.test.SpringClusterTestCase.testStandalone(SpringClusterTestCase.java:43)
at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24)
at junit.extensions.TestSetup$1.protect(TestSetup.java:21)
at junit.extensions.TestSetup.run(TestSetup.java:25)

In the server log you can see:
...
DEPLOYMENTS IN ERROR:
Deployment "vfszip:/home/brq/mmalina/jbossqa/ibm/jboss-5.1.0.CR1-src/testsuite/output/lib/spring-cluster-pojos.jar/" is in error due to the following reason(s): java.lang.ClassNotFoundException: net.jcip.annotations.ThreadSafe
...

Which shows that it is again the same problem with net.jcip.annotations.ThreadSafe missing in IBM JDK as discussed here JBAS-6934 and JBAS-6428.

Solution: Ensure that jcip-annotations.jar gets copied to server/springdeployer/lib/ when the config is created.
A. Add jcip-annotations.jar to server/default/lib (it is 2.6 KB) - springdeployer is created out of default
B. Change testsuite/build.xml to make ant copy jcip-annotations.jar from server/all/lib/ to server/springdeployer/lib/ - don't know how to do that easily

A. seems easier to do.