diff --git a/lib/inspec/dsl.rb b/lib/inspec/dsl.rb
index 1eecee12cc..48d7bd94ac 100644
--- a/lib/inspec/dsl.rb
+++ b/lib/inspec/dsl.rb
@@ -3,6 +3,7 @@
 # author: Dominik Richter
 # author: Christoph Hartmann
 require 'inspec/log'
+require 'inspec/plugin/v2'
 
 module Inspec::DSL
   def require_controls(id, &block)
diff --git a/lib/inspec/plugin/v2/plugin_types/cli.rb b/lib/inspec/plugin/v2/plugin_types/cli.rb
index 5613e4320e..f64939b0a1 100644
--- a/lib/inspec/plugin/v2/plugin_types/cli.rb
+++ b/lib/inspec/plugin/v2/plugin_types/cli.rb
@@ -1,8 +1,13 @@
 require 'inspec/base_cli'
 
+# The InSpec load order has this file being loaded before `inspec/base_cli` can
+# finish being loaded. So, we must define Inspec::BaseCLI here first to avoid
+# a NameError below.
+class Inspec::BaseCLI < Thor; end
+
 module Inspec::Plugin::V2::PluginType
   class CliCommand < Inspec::BaseCLI
-    # initalize log options for plugins
+    # initialize log options for plugins
     def initialize(args, options, config)
       super(args, options, config)
       class_options = config.fetch(:class_options, nil)