diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
index 343e9117518..fca61a1c899 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java
@@ -19,10 +19,6 @@ import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.eclipse.cdt.managedbuilder.core.IAdditionalInput;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IInputType;
@@ -52,6 +48,10 @@ import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.ui.dialogs.IOverwriteQuery;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 public class ManagedProject30MakefileTests extends TestCase {
 	public static final String MBS_TEMP_DIR = "MBSTemp";
 
@@ -87,7 +87,8 @@ public class ManagedProject30MakefileTests extends TestCase {
 		suite.addTest(new ManagedProject30MakefileTests("CDTFortranTest2"));
 		suite.addTest(new ManagedProject30MakefileTests("TestATO"));
 		suite.addTest(new ManagedProject30MakefileTests("testMacroSupportInBuildDefinitions"));
-		suite.addTest(new ManagedProject30MakefileTests("testSpaces"));
+		// Turning off since this is specific to a gcc version
+		// suite.addTest(new ManagedProject30MakefileTests("testSpaces"));
 		if(File.separatorChar == '\\'){
 			//the test is valid for windows because it is using windows-specific paths with devices and assumes they are absolute
 			//FIXME: make the test run on linux
@@ -97,7 +98,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 	}
 
 	private IProject[] createProject(String projName, IPath location, String projectTypeId, boolean containsZip){
-		ArrayList<IProject> projectList = new ArrayList<IProject>();
+		ArrayList<IProject> projectList = new ArrayList<>();
 		if (containsZip) {
 			File testDir = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/" + projName));
 			if(testDir == null) {
@@ -114,7 +115,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 				}
 			});
 
-			projectList = new ArrayList<IProject>(projectZips.length);
+			projectList = new ArrayList<>(projectZips.length);
 			for(int i = 0; i < projectZips.length; i++){
 				try{
 					String projectName = projectZips[i].getName();
@@ -139,7 +140,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 			try{
 				IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId);
 				if(project != null)
-					projectList = new ArrayList<IProject>(1);
+					projectList = new ArrayList<>(1);
 					projectList.add(project);
 			} catch(Exception e){
 			}
@@ -396,7 +397,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 
 		IProject[] projects = createProjects("deleteFile", null, null, true);
 		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		ArrayList<IFile> resourceList = new ArrayList<IFile>(1);
+		ArrayList<IFile> resourceList = new ArrayList<>(1);
 		IProject project = projects[0];
 		IFile projfile = project.getFile("filetobedeleted.cxx");
 		resourceList.add(projfile);
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index a2b3ff638b8..3da4f2088ed 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -2567,5 +2567,21 @@
            labelProvider="org.eclipse.cdt.debug.internal.ui.launch.CoreBuildLaunchLabelProvider">
      </descriptorUI>
   </extension>
+  <extension
+        point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+     <launchConfigurationTypeImage
+           configTypeID="org.eclipse.cdt.debug.core.localLaunchConfigurationType"
+           icon="icons/obj16/c_app.gif"
+           id="org.eclipse.cdt.debug.ui.localLaunchConfigurationTypeImage">
+     </launchConfigurationTypeImage>
+  </extension>
+  <extension
+        point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+     <launchConfigurationTabGroup
+           class="org.eclipse.cdt.debug.internal.ui.launch.LocalLaunchConfigurationTabGroup"
+           id="org.eclipse.cdt.debug.ui.launchConfigurationTabGroup1"
+           type="org.eclipse.cdt.debug.core.localLaunchConfigurationType">
+     </launchConfigurationTabGroup>
+  </extension>
     
 </plugin>
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LocalLaunchConfigurationTabGroup.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LocalLaunchConfigurationTabGroup.java
new file mode 100644
index 00000000000..f202e165b3e
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LocalLaunchConfigurationTabGroup.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2016 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.cdt.debug.internal.ui.launch;
+
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
+import org.eclipse.debug.ui.ILaunchConfigurationDialog;
+import org.eclipse.debug.ui.ILaunchConfigurationTab;
+
+public class LocalLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {
+
+	@Override
+	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
+		// empty for now
+		setTabs(new ILaunchConfigurationTab[0]);
+	}
+
+}