diff --git a/makefiles/tests/feature_resolution/test-conflict-optional.mk b/makefiles/tests/feature_resolution/test-conflict-optional.mk
new file mode 100644
index 0000000000..5d64067dc2
--- /dev/null
+++ b/makefiles/tests/feature_resolution/test-conflict-optional.mk
@@ -0,0 +1,15 @@
+# inputs
+FEATURES_OPTIONAL := b
+FEATURES_REQUIRED := a c
+FEATURES_REQUIRED_ANY :=
+FEATURES_PROVIDED := a b c d
+FEATURES_BLACKLIST :=
+FEATURES_CONFLICT := a:b c:d
+
+# expected results
+EXPECTED_FEATURES_USED := a c
+EXPECTED_FEATURES_MISSING :=
+EXPECTED_FEATURES_USED_BLACKLISTED :=
+EXPECTED_FEATURES_CONFLICTING :=
+
+include Makefile.test