diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/StackBasedSecurityContextHolderStrategy.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/StackBasedSecurityContextHolderStrategy.java
index 8ef727f1b9..7424703086 100644
--- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/StackBasedSecurityContextHolderStrategy.java
+++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/StackBasedSecurityContextHolderStrategy.java
@@ -39,7 +39,7 @@ public class StackBasedSecurityContextHolderStrategy implements SecurityContextH
 
 	public void clearContext() {
 		if (getStackForThread().size() > 0) {
-			SecurityContext ctx = getStackForThread().poll();
+			SecurityContext ctx = getStackForThread().removeFirst();
 			logger.debug("Popped security context " + ctx);
 		}
 	}
@@ -47,7 +47,7 @@ public class StackBasedSecurityContextHolderStrategy implements SecurityContextH
 	public SecurityContext getContext() {
 		if (getStackForThread().peek() == null) {
 			logger.debug("Pushed new blank security context");
-			getStackForThread().offer(new SecurityContextImpl());
+			getStackForThread().addFirst(new SecurityContextImpl());
 		}
 
 		return (SecurityContext) getStackForThread().peek();
@@ -56,7 +56,7 @@ public class StackBasedSecurityContextHolderStrategy implements SecurityContextH
 	public void setContext(SecurityContext context) {
 		Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
 
-		getStackForThread().offer(context);
+		getStackForThread().addFirst(context);
 		logger.debug("Pushed context " + context);
 	}
 
diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextAssociatingHandlerInterceptorTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextAssociatingHandlerInterceptorTests.java
index 22049352fc..f4ef54b97a 100644
--- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextAssociatingHandlerInterceptorTests.java
+++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextAssociatingHandlerInterceptorTests.java
@@ -22,8 +22,6 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.After;
 import org.junit.Test;
-
-import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.StringMessage;
diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextPropagatingChannelInterceptorTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextPropagatingChannelInterceptorTests.java
index 2f452244e2..a29bc9ef31 100644
--- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextPropagatingChannelInterceptorTests.java
+++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/SecurityContextPropagatingChannelInterceptorTests.java
@@ -77,9 +77,6 @@ public class SecurityContextPropagatingChannelInterceptorTests {
 		channel.send(message);
 		message = (StringMessage) channel.receive(0);
 		MessageHeader header = message.getHeader();
-		
-		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-		
 		assertFalse("Security context header found when no security context existed.",
 				header.getAttributeNames().contains(SecurityContextPropagatingChannelInterceptor.SECURITY_CONTEXT_HEADER_ATTRIBUTE));
 	}
diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredParserTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredParserTests.java
index a9f0d54b56..e129b7582b 100644
--- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredParserTests.java
+++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredParserTests.java
@@ -76,7 +76,6 @@ public class SecuredParserTests extends AbstractJUnit4SpringContextTests{
 	public void testAdminRequiredForSendWithAccessGranted() {
 		login("jimi", "jimispassword");
 		adminRequiredForSend.send(new StringMessage("testmessage"));
-		SecurityContextHolder.clearContext();
 		assertNotNull("Message not received", adminRequiredForSend.receive(0));
 	}