diff --git a/lib/motion/project/xcode_config.rb b/lib/motion/project/xcode_config.rb
index f52c075f..9d5d188e 100644
--- a/lib/motion/project/xcode_config.rb
+++ b/lib/motion/project/xcode_config.rb
@@ -399,8 +399,8 @@ EOS
         else
           App.fail("Invalid Instruments template path or name.")
         end
-        if xcode_version[0] >= '6.0' && xcode_version[0] < '6.3'
-          # workaround for RM-599, RM-672 and RM-832. Xcode 6.3 beta doesn't need this workaround. complex :(
+        if xcode_version[0] >= '6.0' && !xcode_dir.include?("-Beta.app")
+          # workaround for RM-599, RM-672 and RM-832. Xcode 6.x beta doesn't need this workaround
           template_path = File.expand_path("#{xcode_dir}/../Applications/Instruments.app/Contents/Resources/templates/#{template_path}.tracetemplate")
         end
         optional_data['XrayTemplatePath'] = template_path