diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java
index 9399cfe828b..15f988ca59d 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java
@@ -397,10 +397,17 @@ public class MIRunControlTest extends BaseTestCase {
         	/*
         	 * getModelData should return StateChangeReason.  
         	 */
-	   	 	Assert.assertTrue(" State change reason for a normal execution should be USER_REQUEST instead of " + data.getStateChangeReason(), 
-                StateChangeReason.USER_REQUEST == data.getStateChangeReason());
+	   	 	Assert.assertEquals("Unexpected state change reason.", getExpectedMainThreadStopReason(), data.getStateChangeReason());
        } 
 	}
+	
+	/**
+	 * Allows subclasses to override the expected reason for the stop on main.    
+	 * @return
+	 */
+	protected StateChangeReason getExpectedMainThreadStopReason() {
+		return StateChangeReason.USER_REQUEST;
+	}
 
 	@Test
 	public void getModelDataForThreadWhenStep() throws Throwable {
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MIRunControlTest_7_0.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MIRunControlTest_7_0.java
index 9929304fab4..0eecaff70f3 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MIRunControlTest_7_0.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/MIRunControlTest_7_0.java
@@ -11,6 +11,7 @@
 package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_0;
 
 
+import org.eclipse.cdt.dsf.debug.service.IRunControl.StateChangeReason;
 import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner;
 import org.eclipse.cdt.tests.dsf.gdb.tests.MIRunControlTest;
 import org.junit.BeforeClass;
@@ -22,4 +23,9 @@ public class MIRunControlTest_7_0 extends MIRunControlTest {
 	public static void beforeClassMethod_7_0() {
 		setGdbProgramNamesLaunchAttributes("7.0");		
 	}
+	
+	@Override
+	protected StateChangeReason getExpectedMainThreadStopReason() {
+		return StateChangeReason.BREAKPOINT;
+	}
 }