diff --git a/lib/toaster/model/automation.rb b/lib/toaster/model/automation.rb
index 8505e36..e2bb003 100644
--- a/lib/toaster/model/automation.rb
+++ b/lib/toaster/model/automation.rb
@@ -38,7 +38,7 @@ def initialize(attr_hash)
     def get_globally_executed_tasks()
       exec_tasks = Task.
           joins(:task_executions => {:automation_run => :automation}).
-          where("automation_runs.automation_id = #{self.id}").
+          where("automation_runs.automation_id = #{self.uuid}").
           distinct()
       return exec_tasks if !exec_tasks.empty?
       return tasks
@@ -72,7 +72,7 @@ def get_task_execs_by_run()
 
     def get_all_test_cases()
       TestCase.joins(:automation_run => :automation).where(
-        "automations.id = #{self.id}")
+        "automations.id = #{self.uuid}")
     end
 
     def is_chef?