diff --git a/library/stdarch/Cargo.toml b/library/stdarch/Cargo.toml
index 76f09868bcad..0db8852a01d8 100644
--- a/library/stdarch/Cargo.toml
+++ b/library/stdarch/Cargo.toml
@@ -20,3 +20,4 @@ opt-level = 3
 
 [dev-dependencies]
 stdsimd-test = { path = "stdsimd-test" }
+cupid = "0.3"
diff --git a/library/stdarch/tests/cpu-detection.rs b/library/stdarch/tests/cpu-detection.rs
new file mode 100644
index 000000000000..764de415345d
--- /dev/null
+++ b/library/stdarch/tests/cpu-detection.rs
@@ -0,0 +1,25 @@
+#![feature(cfg_target_feature)]
+
+#[macro_use]
+extern crate stdsimd;
+extern crate cupid;
+
+#[test]
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+fn works() {
+    let information = cupid::master().unwrap();
+    assert_eq!(cfg_feature_enabled!("sse"), information.sse());
+    assert_eq!(cfg_feature_enabled!("sse2"), information.sse2());
+    assert_eq!(cfg_feature_enabled!("sse3"), information.sse3());
+    assert_eq!(cfg_feature_enabled!("ssse3"), information.ssse3());
+    assert_eq!(cfg_feature_enabled!("sse4.1"), information.sse4_1());
+    assert_eq!(cfg_feature_enabled!("sse4.2"), information.sse4_2());
+    assert_eq!(cfg_feature_enabled!("avx"), information.avx());
+    assert_eq!(cfg_feature_enabled!("avx2"), information.avx2());
+    assert_eq!(cfg_feature_enabled!("fma"), information.fma());
+    assert_eq!(cfg_feature_enabled!("bmi"), information.bmi1());
+    assert_eq!(cfg_feature_enabled!("bmi2"), information.bmi2());
+    assert_eq!(cfg_feature_enabled!("popcnt"), information.popcnt());
+
+    // TODO: tbm, abm, lzcnt
+}