diff --git a/lib/foreman/export.rb b/lib/foreman/export.rb
index e86203d..ab206c1 100644
--- a/lib/foreman/export.rb
+++ b/lib/foreman/export.rb
@@ -4,5 +4,6 @@ module Foreman::Export
   class Exception < ::Exception; end
 end
 
+require "foreman/export/base"
 require "foreman/export/inittab"
 require "foreman/export/upstart"
diff --git a/lib/foreman/export/inittab.rb b/lib/foreman/export/inittab.rb
index ec18380..eb448a0 100644
--- a/lib/foreman/export/inittab.rb
+++ b/lib/foreman/export/inittab.rb
@@ -1,4 +1,4 @@
-require "foreman/export/base"
+require "foreman/export"
 
 class Foreman::Export::Inittab < Foreman::Export::Base
 
diff --git a/lib/foreman/export/upstart.rb b/lib/foreman/export/upstart.rb
index 109369b..4ff362d 100644
--- a/lib/foreman/export/upstart.rb
+++ b/lib/foreman/export/upstart.rb
@@ -1,5 +1,5 @@
 require "erb"
-require "foreman/export/base"
+require "foreman/export"
 
 class Foreman::Export::Upstart < Foreman::Export::Base
 
diff --git a/spec/foreman/export/upstart_spec.rb b/spec/foreman/export/upstart_spec.rb
index 7cacaa3..329273f 100644
--- a/spec/foreman/export/upstart_spec.rb
+++ b/spec/foreman/export/upstart_spec.rb
@@ -1,4 +1,5 @@
 require "spec_helper"
+require "foreman/engine"
 require "foreman/export/upstart"
 
 describe Foreman::Export::Upstart do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9fa0b6b..a6f1cc6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,7 +3,7 @@ require "rspec"
 require "fakefs/safe"
 require "fakefs/spec_helpers"
 
-$:.unshift "lib"
+$:.unshift File.expand_path("../../lib", __FILE__)
 
 def mock_error(subject, message)
   mock_exit do