diff --git a/org.springframework.core/src/main/java/org/springframework/core/NamedInheritableThreadLocal.java b/org.springframework.core/src/main/java/org/springframework/core/NamedInheritableThreadLocal.java
index e66e94e528..bb7cfb8937 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/NamedInheritableThreadLocal.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/NamedInheritableThreadLocal.java
@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
  * @since 2.5.2
  * @see NamedThreadLocal
  */
-public class NamedInheritableThreadLocal extends InheritableThreadLocal {
+public class NamedInheritableThreadLocal<T> extends InheritableThreadLocal<T> {
 
 	private final String name;
 
diff --git a/org.springframework.core/src/main/java/org/springframework/core/NamedThreadLocal.java b/org.springframework.core/src/main/java/org/springframework/core/NamedThreadLocal.java
index 08d1d2be35..4b2b823800 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/NamedThreadLocal.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/NamedThreadLocal.java
@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
  * @since 2.5.2
  * @see NamedInheritableThreadLocal
  */
-public class NamedThreadLocal extends ThreadLocal {
+public class NamedThreadLocal<T> extends ThreadLocal<T> {
 
 	private final String name;