diff --git a/lib/motion/project/xcode_config.rb b/lib/motion/project/xcode_config.rb
index d44482d3..699a3eb6 100644
--- a/lib/motion/project/xcode_config.rb
+++ b/lib/motion/project/xcode_config.rb
@@ -321,6 +321,9 @@ EOS
         else
           App.fail("Invalid Instruments template path or name.")
         end
+        if xcode_version[0] >= '6.0'
+          template_path = File.expand_path("#{xcode_dir}/../Applications/Instruments.app/Contents/Resources/templates/#{template_path}.tracetemplate")
+        end
         optional_data['XrayTemplatePath'] = template_path
       end