diff --git a/lib/ceedling/configurator_builder.rb b/lib/ceedling/configurator_builder.rb
index b6ab7e84..6c776584 100644
--- a/lib/ceedling/configurator_builder.rb
+++ b/lib/ceedling/configurator_builder.rb
@@ -228,6 +228,37 @@ def set_build_thread_counts(in_hash)
   end
 
 
+  def set_test_preprocessor_accessors(in_hash)
+    accessors = {}
+
+    # :project_use_test_preprocessor already validated
+    case in_hash[:project_use_test_preprocessor]
+    when :none
+      accessors = {
+        :project_use_test_preprocessor_tests => false,
+        :project_use_test_preprocessor_mocks => false
+      }    
+    when :all
+      accessors = {
+        :project_use_test_preprocessor_tests => true,
+        :project_use_test_preprocessor_mocks => true
+      }    
+    when :tests
+      accessors = {
+        :project_use_test_preprocessor_tests => true,
+        :project_use_test_preprocessor_mocks => false
+      }    
+    when :mocks
+      accessors = {
+        :project_use_test_preprocessor_tests => false,
+        :project_use_test_preprocessor_mocks => true
+      }    
+    end
+
+    return accessors
+  end
+
+
   def expand_all_path_globs(in_hash)
     out_hash = {}
     path_keys = []
diff --git a/lib/ceedling/configurator_setup.rb b/lib/ceedling/configurator_setup.rb
index 3c78023e..3e41fb3d 100644
--- a/lib/ceedling/configurator_setup.rb
+++ b/lib/ceedling/configurator_setup.rb
@@ -39,6 +39,7 @@ def build_project_config(ceedling_lib_path, flattened_config)
     flattened_config.merge!( @configurator_builder.set_rakefile_components( ceedling_lib_path, flattened_config ) )
     flattened_config.merge!( @configurator_builder.set_release_target( flattened_config ) )
     flattened_config.merge!( @configurator_builder.set_build_thread_counts( flattened_config ) )
+    flattened_config.merge!( @configurator_builder.set_test_preprocessor_accessors( flattened_config ) )
 
     return flattened_config
   end