diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/InputOutputBindingOrderTest.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/InputOutputBindingOrderTest.java
index 3de6254dc..6ed07bc39 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/InputOutputBindingOrderTest.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/InputOutputBindingOrderTest.java
@@ -21,13 +21,11 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.util.Properties;
 
 import org.junit.Test;
 import org.mockito.Mockito;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -47,7 +45,8 @@ public class InputOutputBindingOrderTest {
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testInputOutputBindingOrder() {
-		ConfigurableApplicationContext applicationContext = SpringApplication.run(TestSource.class);
+		ConfigurableApplicationContext applicationContext = SpringApplication.run(TestSource.class, "--server.port=-1");
+		@SuppressWarnings("rawtypes")
 		Binder binder = applicationContext.getBean(Binder.class);
 		Processor processor = applicationContext.getBean(Processor.class);
 		// input is bound after the context has been started
@@ -82,20 +81,20 @@ public class InputOutputBindingOrderTest {
 
 		@Override
 		public synchronized void start() {
-			verify(binder).bindProducer(eq("output"), eq(processor.output()), Mockito.<Properties>any());
+			verify(this.binder).bindProducer(eq("output"), eq(this.processor.output()), Mockito.<Properties>any());
 			// input was not bound yet
-			verifyNoMoreInteractions(binder);
+			verifyNoMoreInteractions(this.binder);
 			this.running = true;
 		}
 
 		@Override
 		public synchronized void stop() {
-			running = false;
+			this.running = false;
 		}
 
 		@Override
 		public synchronized boolean isRunning() {
-			return running;
+			return this.running;
 		}
 
 		@Override
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/LifecycleBinderTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/LifecycleBinderTests.java
index 6d89e5a58..b61df2f7c 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/LifecycleBinderTests.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/LifecycleBinderTests.java
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.mockito.Mockito;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.cloud.stream.annotation.EnableBinding;
@@ -37,10 +35,9 @@ import org.springframework.context.annotation.Import;
  */
 public class LifecycleBinderTests {
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testNonSmartLifecyclesStarted() {
-		ConfigurableApplicationContext applicationContext = SpringApplication.run(TestSource.class);
+		ConfigurableApplicationContext applicationContext = SpringApplication.run(TestSource.class, "--server.port=-1");
 		SimpleLifecycle simpleLifecycle = applicationContext.getBean(SimpleLifecycle.class);
 		assertTrue(simpleLifecycle.isRunning());
 		applicationContext.close();
@@ -64,17 +61,17 @@ public class LifecycleBinderTests {
 
 		@Override
 		public synchronized void start() {
-			running = true;
+			this.running = true;
 		}
 
 		@Override
 		public synchronized void stop() {
-			running = false;
+			this.running = false;
 		}
 
 		@Override
 		public synchronized boolean isRunning() {
-			return running;
+			return this.running;
 		}
 	}
 }