diff --git a/targets/arduino-nano.json b/targets/arduino-nano.json
index b1f27809..9f3a3b9f 100644
--- a/targets/arduino-nano.json
+++ b/targets/arduino-nano.json
@@ -5,5 +5,6 @@
 		"-Wl,--defsym=_bootloader_size=512",
 		"-Wl,--defsym=_stack_size=512"
 	],
-	"flash-command": "avrdude -c arduino -p atmega328p -b 57600 -P {port} -U flash:w:{hex}:i"
+	"flash-command": "avrdude -c arduino -p atmega328p -b 57600 -P {port} -U flash:w:{hex}:i",
+	"emulator": ["simavr", "-m", "atmega328p", "-f", "16000000"]
 }
diff --git a/targets/arduino.json b/targets/arduino.json
index fbbca7a8..ebe8af51 100644
--- a/targets/arduino.json
+++ b/targets/arduino.json
@@ -5,5 +5,6 @@
 		"-Wl,--defsym=_bootloader_size=512",
 		"-Wl,--defsym=_stack_size=512"
 	],
-	"flash-command": "avrdude -c arduino -p atmega328p -P {port} -U flash:w:{hex}:i"
+	"flash-command": "avrdude -c arduino -p atmega328p -P {port} -U flash:w:{hex}:i",
+	"emulator": ["simavr", "-m", "atmega328p", "-f", "16000000"]
 }
diff --git a/targets/atmega328p.json b/targets/atmega328p.json
index 181da693..7a10eceb 100644
--- a/targets/atmega328p.json
+++ b/targets/atmega328p.json
@@ -12,6 +12,5 @@
 	"extra-files": [
 		"targets/avr.S",
 		"src/device/avr/atmega328p.s"
-	],
-	"emulator": ["simavr", "-m", "atmega328p", "-f", "16000000"]
+	]
 }