diff --git a/src/test/java/net/floodlightcontroller/core/internal/OFSwitchHandlerTestBase.java b/src/test/java/net/floodlightcontroller/core/internal/OFSwitchHandlerTestBase.java
index f035adf653f336c244c064f522c1a23fa75fd3c5..87841aa6f58169888ff3eddd93ac71bf57c58847 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/OFSwitchHandlerTestBase.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/OFSwitchHandlerTestBase.java
@@ -115,7 +115,7 @@ public abstract class OFSwitchHandlerTestBase {
 		}
 	}
 
-	@Before
+	
 	public void setUpFeaturesReply() {
 		getFeaturesReply();
 		this.featuresReply = getFeaturesReply();
@@ -132,6 +132,12 @@ public abstract class OFSwitchHandlerTestBase {
 
 	@Before
 	public void setUp() throws Exception {
+		/*
+		 * This needs to be called explicitly to ensure the featuresReply is not null.
+		 * Otherwise, there is no guarantee @Before will for setUpFeaturesReply() will
+		 * call that function before our @Before setUp() here.
+		 */
+		setUpFeaturesReply(); 
 		switchManager = createMock(IOFSwitchManager.class);
 		roleManager = createMock(RoleManager.class);
 		sw = createMock(IOFSwitchBackend.class);