diff --git a/includes/admin.inc b/includes/admin.inc
index b3e68d6473eed05eb6a702b6571b14b1402f814d..1550fd62f5d832f4335de1404dddfa2107f57ea2 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -706,8 +706,9 @@ function views_ui_nojs_submit($form, &$form_state) {
 function views_ui_wizard_form_validate($form, &$form_state) {
   $wizard = views_ui_get_wizard($form_state['values']['show']['wizard_key']);
   $manager = views_get_plugin_manager('wizard');
+  $definition = $manager->getDefinition($wizard['plugin_id']);
   $form_state['wizard'] = $wizard;
-  $form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id']);
+  $form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id'], $definition);
   $errors = $form_state['wizard_instance']->validate($form, $form_state);
   foreach ($errors as $name => $message) {
     form_set_error($name, $message);
diff --git a/lib/Drupal/views/Plugins/Type/WizardPluginManager.php b/lib/Drupal/views/Plugins/Type/WizardPluginManager.php
index 092e96862ac7cf47547f72fd2548fdb5a68ab6e9..5171c974d398be5992e6eb3cd1c92aa9b166766d 100644
--- a/lib/Drupal/views/Plugins/Type/WizardPluginManager.php
+++ b/lib/Drupal/views/Plugins/Type/WizardPluginManager.php
@@ -9,7 +9,7 @@
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\views\Plugins\Discovery\ViewsDiscovery;
 
 class WizardPluginManager extends PluginManagerBase {
   public function __construct() {