diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java
index 3cff8906361..f54441581db 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java
@@ -68,7 +68,7 @@ public class FullIntegration {
 				new URL("https://adafruit.github.io/arduino-board-index/package_adafruit_index.json"),
 				new URL("http://arduino.esp8266.com/stable/package_esp8266com_index.json"),
 				new URL("http://drazzy.com/package_drazzy.com_index.json"),
-				//new URL("https://github.com/chipKIT32/chipKIT-core/raw/master/package_chipkit_index.json"),
+				new URL("https://github.com/chipKIT32/chipKIT-core/raw/master/package_chipkit_index.json"),
 		};
 		ArduinoPreferences.setBoardUrlList(urls);
 
@@ -83,6 +83,8 @@ public class FullIntegration {
 		skipBuild.add(arduinoManager.getBoard("arduino", "avr", "robotControl"));
 		skipBuild.add(arduinoManager.getBoard("arduino", "avr", "robotMotor"));
 		skipBuild.add(arduinoManager.getBoard("adafruit", "avr", "adafruit32u4"));
+		skipBuild.add(arduinoManager.getBoard("chipKIT", "pic32", "cerebot32mx7"));
+		skipBuild.add(arduinoManager.getBoard("chipKIT", "pic32", "OpenScope"));
 
 		// What is Microsoft doing?
 		skipBuild.add(arduinoManager.getBoard("Microsoft", "win10", "w10iotcore"));
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java
index 0668aab4c99..ef220101d32 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java
@@ -226,7 +226,7 @@ public class ArduinoBuildConfiguration extends CBuildConfiguration implements Te
 			properties.put("build.arch", platform.getArchitecture().toUpperCase()); //$NON-NLS-1$
 			properties.put("build.path", "."); //$NON-NLS-1$ //$NON-NLS-2$
 			properties.put("build.core.path", //$NON-NLS-1$
-					platform.getInstallPath().resolve("core").resolve("{build.core}").toString()); //$NON-NLS-1$ //$NON-NLS-2$
+					platform.getInstallPath().resolve("cores").resolve("{build.core}").toString()); //$NON-NLS-1$ //$NON-NLS-2$
 			properties.put("build.system.path", platform.getInstallPath().resolve("system").toString()); //$NON-NLS-1$ //$NON-NLS-2$
 			properties.put("build.variant.path", //$NON-NLS-1$
 					platform.getInstallPath().resolve("variants").resolve("{build.variant}").toString()); //$NON-NLS-1$ //$NON-NLS-2$