diff --git a/lib/orchestrate.rb b/lib/orchestrate.rb
index <HASH>..<HASH> 100644
--- a/lib/orchestrate.rb
+++ b/lib/orchestrate.rb
@@ -10,7 +10,9 @@ module Orchestrate
           persistence_adapter: Dynflow::PersistenceAdapters::Sequel.new(db_config),
           transaction_adapter: Dynflow::TransactionAdapters::ActiveRecord.new }
 
-    @world = Dynflow::World.new(world_options)
+    @world = Orchestrate::World.new(world_options).tap do
+      at_exit { @world.terminate!.wait }
+    end
   end
 
   def self.trigger(action, *args)
add graceful shutdown of Dynflow World