diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
index 8f42d11bf1..048bc025ac 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ import javax.security.auth.AuthPermission;
 import javax.security.auth.Subject;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -69,7 +70,6 @@ import org.springframework.core.io.Resource;
  * 
  * @author Costin Leau
  */
-@org.junit.Ignore
 public class CallbacksSecurityTests {
 
 	private XmlBeanFactory beanFactory;
@@ -436,7 +436,8 @@ public class CallbacksSecurityTests {
 	}
 
 	@Test
-	public void testContainerPriviledges() throws Exception {
+	@Ignore // TODO SPR-8116 passes under Eclipse, but fails under Gradle with https://gist.github.com/1664133
+	public void testContainerPrivileges() throws Exception {
 		AccessControlContext acc = provider.getAccessControlContext();
 
 		AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
index 037c7aff67..a2a64855d4 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrat
  *
  * @author Juergen Hoeller
  */
-@org.junit.Ignore // until we work out JPA 1 vs 2 classpath issues in .orm
+@org.junit.Ignore // TODO SPR-8116 work out JPA 1 vs 2 classpath issues in spring-orm
 public class HibernateMultiEntityManagerFactoryIntegrationTests extends
 		AbstractContainerEntityManagerFactoryIntegrationTests {
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
index ae99c8e3b8..c3f9c2cf1d 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,12 @@ package org.springframework.orm.jpa.openjpa;
  *
  * @author Ramnivas Laddad
  */
-@org.junit.Ignore // TODO this test causes gradle to hang. uncomment and figure out why
+@org.junit.Ignore // TODO SPR-8116 this test causes gradle to hang.
+// when run independently e.g. `./gradlew :spring-orm:test -Dtest.single=OpenJpaEntity...`
+// it works fine. When run together with all other tests e.g. `./gradlew :spring-orm:test`
+// it hangs on the 'testCanSerializeProxies' test method. Note that this test DOES pass in
+// Eclipse, even when the entire 'spring-orm' module is run. Run gradle with '-i' to
+// get more details when reproducing the hanging test.
 public class OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests extends OpenJpaEntityManagerFactoryIntegrationTests {
 
 	protected String[] getConfigLocations() {
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
index dd9fdf55f1..618004188c 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrat
  *
  * @author Costin Leau
  */
-@org.junit.Ignore // TODO this test causes gradle to hang. uncomment and figure out why
+@org.junit.Ignore // TODO SPR-8116 this test causes gradle to hang. See OJEMFWAJWIT.
 public class TopLinkMultiEntityManagerFactoryIntegrationTests extends
 		AbstractContainerEntityManagerFactoryIntegrationTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
index d26c0ed3db..e1d77ab5d5 100644
--- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
+++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,8 +76,7 @@ public class ProfileValueAnnotationAwareTransactionalTests extends TestCase {
 
 
 	@SuppressWarnings("deprecation")
-	@org.junit.Ignore // causes https://gist.github.com/1165828
-	protected static class DefaultProfileValueSourceTestCase extends AbstractAnnotationAwareTransactionalTests {
+	public static class DefaultProfileValueSourceTestCase extends AbstractAnnotationAwareTransactionalTests {
 
 		int invocationCount = 0;
 
@@ -134,8 +133,7 @@ public class ProfileValueAnnotationAwareTransactionalTests extends TestCase {
 	}
 
 	@ProfileValueSourceConfiguration(HardCodedProfileValueSource.class)
-	@org.junit.Ignore // causes https://gist.github.com/1165832
-	protected static class HardCodedProfileValueSourceTestCase extends DefaultProfileValueSourceTestCase {
+	public static class HardCodedProfileValueSourceTestCase extends DefaultProfileValueSourceTestCase {
 	}
 
 	public static class HardCodedProfileValueSource implements ProfileValueSource {
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
index c6f74c3241..9b00448014 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,7 +104,7 @@ public class FailingBeforeAndAfterMethodsTests {
 		}
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@SuppressWarnings("deprecation")
 	@TestExecutionListeners(listeners = AlwaysFailingBeforeTestMethodTestExecutionListener.class, inheritListeners = false)
 	public static class AlwaysFailingBeforeTestMethodTestCase extends AbstractJUnit38SpringContextTests {
@@ -113,7 +113,7 @@ public class FailingBeforeAndAfterMethodsTests {
 		}
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@SuppressWarnings("deprecation")
 	@TestExecutionListeners(listeners = AlwaysFailingAfterTestMethodTestExecutionListener.class, inheritListeners = false)
 	public static class AlwaysFailingAfterTestMethodTestCase extends AbstractJUnit38SpringContextTests {
@@ -122,7 +122,7 @@ public class FailingBeforeAndAfterMethodsTests {
 		}
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@SuppressWarnings("deprecation")
 	@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")
 	public static class FailingBeforeTransactionalTestCase extends AbstractTransactionalJUnit38SpringContextTests {
@@ -136,7 +136,7 @@ public class FailingBeforeAndAfterMethodsTests {
 		}
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@SuppressWarnings("deprecation")
 	@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")
 	public static class FailingAfterTransactionalTestCase extends AbstractTransactionalJUnit38SpringContextTests {
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
index 0bfa0087d5..8a6f32c512 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,14 +58,12 @@ public class RepeatedJUnit38SpringContextTests extends TestCase {
 	 * explicitly configured with an empty list, thus disabling all default
 	 * listeners.
 	 */
-	@org.junit.Ignore // causes https://gist.github.com/1165825
 	@SuppressWarnings("deprecation")
 	@TestExecutionListeners(listeners = {}, inheritListeners = false)
-	protected static class RepeatedTestCase extends AbstractJUnit38SpringContextTests {
+	public static class RepeatedTestCase extends AbstractJUnit38SpringContextTests {
 
 		int invocationCount = 0;
 
-
 		public RepeatedTestCase(final String name) throws Exception {
 			super(name);
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
index 39fe1ab575..f0e343a36d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public class ExpectedExceptionSpringRunnerTests {
 	}
 
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@RunWith(SpringJUnit4ClassRunner.class)
 	@TestExecutionListeners({})
 	public static final class ExpectedExceptionSpringRunnerTestCase {
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
index 3ca7ce1c81..b91122d4af 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,32 +146,32 @@ public class FailingBeforeAndAfterMethodsTests {
 		}
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@TestExecutionListeners(AlwaysFailingBeforeTestClassTestExecutionListener.class)
 	public static class AlwaysFailingBeforeTestClassTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@TestExecutionListeners(AlwaysFailingAfterTestClassTestExecutionListener.class)
 	public static class AlwaysFailingAfterTestClassTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@TestExecutionListeners(AlwaysFailingPrepareTestInstanceTestExecutionListener.class)
 	public static class AlwaysFailingPrepareTestInstanceTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@TestExecutionListeners(AlwaysFailingBeforeTestMethodTestExecutionListener.class)
 	public static class AlwaysFailingBeforeTestMethodTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@TestExecutionListeners(AlwaysFailingAfterTestMethodTestExecutionListener.class)
 	public static class AlwaysFailingAfterTestMethodTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")
 	public static class FailingBeforeTransactionTestCase extends AbstractTransactionalJUnit4SpringContextTests {
 
@@ -185,7 +185,7 @@ public class FailingBeforeAndAfterMethodsTests {
 		}
 	}
 
-	@org.junit.Ignore
+	@org.junit.Ignore // TODO SPR-8116
 	@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")
 	public static class FailingAfterTransactionTestCase extends AbstractTransactionalJUnit4SpringContextTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
index d4fc3f45ea..149a000a4f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,7 +151,8 @@ public class RepeatedSpringRunnerTests {
 	 * href="http://jira.springframework.org/browse/SPR-6011"
 	 * target="_blank">SPR-6011</a>.
 	 */
-	@org.junit.Ignore // causing timeouts on cbeams' MBP
+	@org.junit.Ignore // TODO SPR-8116 causing timeouts on cbeams' (otherwise fast) MBP.
+	// Timeouts are 2x-4x their expected range. Something seems wrong indeed.
 	public static final class TimedRepeatedTestCase extends AbstractRepeatedTestCase {
 
 		@Test
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
index b2425f9dd5..1d8a94f30e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,8 @@ public class TimedSpringRunnerTests {
 	}
 
 
-	@org.junit.Ignore // causing timeouts on cbeams' MBP
+	@org.junit.Ignore // TODO SPR-8116 causing timeouts on cbeams' (otherwise fast) MBP.
+	// Timeouts are 2x-5x their expected range. Something seems wrong indeed.
 	@RunWith(SpringJUnit4ClassRunner.class)
 	@TestExecutionListeners( {})
 	public static final class TimedSpringRunnerTestCase {
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
index 5b8288ed52..1389ee8aec 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import org.springframework.test.context.junit4.orm.service.PersonService;
  * @author Sam Brannen
  * @since 3.0
  */
-@org.junit.Ignore // fix hibernate classpath
+@org.junit.Ignore // TODO SPR-8116 (Hibernate classpath-related)
 @ContextConfiguration
 public class HibernateSessionFlushingTests extends AbstractTransactionalJUnit4SpringContextTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/SPR-8116.txt b/spring-test/src/test/java/org/springframework/test/context/testng/SPR-8116.txt
new file mode 100644
index 0000000000..5e22d2f564
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/SPR-8116.txt
@@ -0,0 +1,3 @@
+TODO SPR-8116 re-enable TestNG support for spring-test
+
+These TestNG test classes are currently not run at all.
diff --git a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
index 05e03968dc..f4d25452ad 100644
--- a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
@@ -201,7 +201,6 @@ public class ReflectionTestUtilsTests {
 		}.runTest();
 	}
 
-	/* TODO uncomment and fix this compilation issue: https://gist.github.com/1177807
 	@Test
 	public void invokeMethodWithAutoboxingAndUnboxing() {
 		// IntelliJ IDEA 11 won't accept int assignment here
@@ -223,7 +222,6 @@ public class ReflectionTestUtilsTests {
 		Integer sum = invokeMethod(component, "add", new int[] { 1, 2, 3, 4 });
 		assertEquals("add(1,2,3,4)", 10, sum.intValue());
 	}
-	*/
 
 	@Test
 	public void invokeMethodsSimulatingLifecycleEvents() {
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
index 9d2ac76bae..ce55225328 100644
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ import org.springframework.context.support.GenericApplicationContext;
  * @author Juergen Hoeller
  * @since 2.5
  */
-@org.junit.Ignore // TODO until https://gist.github.com/1150858 is fixed
+@org.junit.Ignore // TODO SPR-8116 - see https://gist.github.com/1150858
 public class JaxWsSupportTests {
 
 	@Test