diff --git a/examples/temp_sensor/project.yml b/examples/temp_sensor/project.yml
index 9377764..db4bf7e 100644
--- a/examples/temp_sensor/project.yml
+++ b/examples/temp_sensor/project.yml
@@ -28,7 +28,7 @@
   :executable: '.exe'
 
 :defines:
-  :common:
+  :test:
     - __monitor
     - UNITY_SUPPORT_64
 
diff --git a/examples/temp_sensor/rakefile_helper.rb b/examples/temp_sensor/rakefile_helper.rb
index c31befb..bb3fbcc 100644
--- a/examples/temp_sensor/rakefile_helper.rb
+++ b/examples/temp_sensor/rakefile_helper.rb
@@ -132,7 +132,7 @@ module RakefileHelpers
 
   # All defines: project common + Unity target + CMock overlay + any extras
   def all_defines(extra = [])
-    (($proj[:defines][:common] || []) +
+    (($proj[:defines][:test] || []) +
      ($unity_cfg[:defines][:test] || []) +
      (($cmock_cfg[:defines] || {})[:test] || []) +
      extra).uniq
diff --git a/test/project.yml b/test/project.yml
index 9b1123e..336bbcb 100644
--- a/test/project.yml
+++ b/test/project.yml
@@ -28,6 +28,6 @@
   :executable: '.exe'
 
 :defines:
-  :common:
+  :test:
     - CMOCK
 
diff --git a/test/rakefile b/test/rakefile
index 35977cf..9e0c68e 100644
--- a/test/rakefile
+++ b/test/rakefile
@@ -82,7 +82,8 @@ namespace :test do
     }
     criteria.each_pair do |k,v|
       crit_defs = v[:defines] || []
-      conf_defs = $unity_cfg.dig(:defines,:test,'*') || $unity_cfg.dig(:defines,:test) || []
+      test_defs = $unity_cfg.dig(:defines,:test)
+      conf_defs = (test_defs.is_a?(Hash) ? test_defs['*'] : nil) || test_defs || []
       if (crit_defs & conf_defs).empty?
         unsupported |= [k] 
       end
diff --git a/test/rakefile_helper.rb b/test/rakefile_helper.rb
index f5f79fe..b4a414e 100644
--- a/test/rakefile_helper.rb
+++ b/test/rakefile_helper.rb
@@ -132,7 +132,7 @@ module RakefileHelpers
 
   # All defines: project common + Unity target + CMock overlay + any extras
   def all_defines(extra = [])
-    (($proj[:defines][:common] || []) +
+    (($proj[:defines][:test] || []) +
      ($unity_cfg[:defines][:test] || []) +
      (($cmock_cfg[:defines] || {})[:test] || []) +
      extra).uniq