From f826c07af50fadd1a53dd061ee1010d9564ae292 Mon Sep 17 00:00:00 2001
From: Christoph Hartmann <chris@lollyrock.com>
Date: Fri, 5 Feb 2016 14:55:12 +0100
Subject: [PATCH] minor improvements

---
 lib/inspec.rb  | 6 +++++-
 test/helper.rb | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/inspec.rb b/lib/inspec.rb
index 1e427e302..fe8aeec1e 100644
--- a/lib/inspec.rb
+++ b/lib/inspec.rb
@@ -16,8 +16,12 @@ require 'inspec/rspec_json_formatter'
 require 'inspec/rule'
 require 'matchers/matchers'
 require 'inspec/runner'
+require 'inspec/shell'
+
+# all utils that may be required by plugins
+require 'utils/base_cli'
+
 # ensure resource and plugins are loaded after runner, because the runner loads
 # targets
 require 'inspec/resource'
 require 'inspec/plugins'
-require 'inspec/shell'
diff --git a/test/helper.rb b/test/helper.rb
index 9d61344b5..6cbffc1e8 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -18,7 +18,6 @@ require 'inspec/resource'
 require 'inspec/backend'
 require 'inspec/profile'
 require 'inspec/targets'
-require 'inspec/targets/zip'
 
 class MockLoader
   # collects emulation operating systems