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 95f02953e74..f70e5bdae4a 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
@@ -31,6 +31,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.remote.core.IRemoteConnection;
@@ -79,6 +80,12 @@ public class FullIntegration {
 		boards.add(arduinoManager.getBoard("arduino", "sam", "arduino_due_x_dbg"));
 		boards.add(arduinoManager.getBoard("Intel", "arc32", "arduino_101"));
 
+		if (Platform.getOS().equals(Platform.OS_WIN32)) {
+			// i586/i686 link missing
+			boards.add(arduinoManager.getBoard("Intel", "i586", "izmir_fd"));
+			boards.add(arduinoManager.getBoard("Intel", "i586", "izmir_fg"));
+			boards.add(arduinoManager.getBoard("Intel", "i686", "izmir_ec"));
+		}
 		return boards;
 	}
 
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java
index 8e1bf113773..d894855033b 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java
@@ -90,7 +90,7 @@ public class ArduinoManager {
 		return ArduinoPreferences.getArduinoHome().resolve(".version"); //$NON-NLS-1$
 	}
 
-	private void init() throws CoreException {
+	private synchronized void init() throws CoreException {
 		if (props == null) {
 			if (!Files.exists(ArduinoPreferences.getArduinoHome())) {
 				try {