diff --git a/main_test.go b/main_test.go
index 03dac09f..9e4a6216 100644
--- a/main_test.go
+++ b/main_test.go
@@ -50,7 +50,7 @@ func TestCompiler(t *testing.T) {
 	}
 
 	t.Run("EmulatedCortexM3", func(t *testing.T) {
-		runPlatTests("qemu", matches, t)
+		runPlatTests("cortex-m-qemu", matches, t)
 	})
 
 	if runtime.GOOS == "linux" {
@@ -76,7 +76,7 @@ func runPlatTests(target string, matches []string, t *testing.T) {
 			}
 		case target == "":
 			// run all tests on host
-		case target == "qemu":
+		case target == "cortex-m-qemu":
 			// all tests are supported
 		default:
 			// cross-compilation of cgo is not yet supported
diff --git a/src/runtime/runtime_qemu.go b/src/runtime/runtime_cortexm_qemu.go
similarity index 96%
rename from src/runtime/runtime_qemu.go
rename to src/runtime/runtime_cortexm_qemu.go
index 37b6d46e..f1f95caa 100644
--- a/src/runtime/runtime_qemu.go
+++ b/src/runtime/runtime_cortexm_qemu.go
@@ -1,4 +1,4 @@
-// +build qemu
+// +build cortexm,qemu
 
 package runtime
 
diff --git a/targets/qemu.json b/targets/cortex-m-qemu.json
similarity index 92%
rename from targets/qemu.json
rename to targets/cortex-m-qemu.json
index de1a6689..03d688a3 100644
--- a/targets/qemu.json
+++ b/targets/cortex-m-qemu.json
@@ -8,7 +8,7 @@
 	],
 	"linkerscript": "targets/lm3s6965.ld",
 	"extra-files": [
-		"targets/qemu.s"
+		"targets/cortex-m-qemu.s"
 	],
 	"emulator": ["qemu-system-arm", "-machine", "lm3s6965evb", "-semihosting", "-nographic", "-kernel"]
 }
diff --git a/targets/qemu.s b/targets/cortex-m-qemu.s
similarity index 96%
rename from targets/qemu.s
rename to targets/cortex-m-qemu.s
index 96aaafb1..2e2fa010 100644
--- a/targets/qemu.s
+++ b/targets/cortex-m-qemu.s
@@ -1,5 +1,5 @@
 // Generic Cortex-M interrupt vector.
-// This vector is used by the QEMU target.
+// This vector is used by the Cortex-M QEMU target.
 
 .syntax unified