diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 67c3738b9227..e6db70a0843e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -345,35 +345,6 @@ $(function() {
   });
 });
 
-function update_puppetclasses(element) {
-  var host_id = $('form').data('id');
-  var url = $(element).attr('data-url');
-  var data = serializeForm().replace('method=patch', 'method=post');
-
-  if (element.value == '') return;
-  if (url.match('hostgroups')) {
-    data = data + '&hostgroup_id=' + host_id;
-  } else {
-    data = data + '&host_id=' + host_id;
-  }
-
-  tfm.tools.showSpinner();
-  $.ajax({
-    type: 'post',
-    url: url,
-    data: data,
-    success: function(request) {
-      $('#puppet_klasses').html(request);
-      reload_puppetclass_params();
-      tfm.tools.activateTooltips();
-      tfm.hostgroups.checkForUnavailablePuppetclasses();
-    },
-    complete: function() {
-      reloadOnAjaxComplete(element);
-    },
-  });
-}
-
 function spinner_placeholder(text) {
   if (text == undefined) text = '';
   return (
diff --git a/app/assets/javascripts/host_edit.js b/app/assets/javascripts/host_edit.js
index 18031aff48e1..c7b41b73634f 100644
--- a/app/assets/javascripts/host_edit.js
+++ b/app/assets/javascripts/host_edit.js
@@ -3,9 +3,6 @@
 $(document).on('ContentLoad', function() {
   onHostEditLoad();
 });
-$(document).on('AddedClass', function(event, link) {
-  load_puppet_class_parameters(link);
-});
 $(document)
   .on('change', '.hostgroup-select', function(evt) {
     hostgroup_changed(evt.target);
@@ -238,44 +235,6 @@ function update_progress(data) {
   $('#tasks_progress').replaceWith(data);
 }
 
-function load_puppet_class_parameters(item) {
-  var id = $(item).attr('data-class-id');
-  // host_id could be either host.id OR hostgroup.id depending on which form
-  var host_id = $('form').data('id');
-  if ($('#puppetclass_' + id + '_params_loading').length > 0) return; // already loading
-  if ($('[id^="#puppetclass_' + id + '_params\\["]').length > 0) return; // already loaded
-  var url = $(item).attr('data-url');
-  var data = serializeForm().replace('method=patch', 'method=post');
-  if (url.match('hostgroups')) {
-    data = data + '&hostgroup_id=' + host_id;
-  } else {
-    data = data + '&host_id=' + host_id;
-  }
-
-  if (url == undefined) return; // no parameters
-  var placeholder = $(
-    '<tr id="puppetclass_' +
-      id +
-      '_params_loading">' +
-      '<td colspan="5">' +
-      spinner_placeholder(__('Loading parameters...')) +
-      '</td></tr>'
-  );
-  $('#inherited_puppetclasses_parameters').append(placeholder);
-  $.ajax({
-    url: url,
-    type: 'post',
-    data: data,
-    success: function(result, textstatus, xhr) {
-      var params = $(result);
-      placeholder.replaceWith(params);
-      params.find('a[rel="popover"]').popover();
-      if (params.find('.error').length > 0)
-        $('#params-tab').addClass('tab-error');
-    },
-  });
-}
-
 function hostgroup_changed(element) {
   var host_id = $('form').data('id');
   var host_changed = $('form').data('type-changed');
@@ -296,7 +255,6 @@ function handleHostgroupChangeEdit(element, host_id, host_changed) {
   } else {
     // edit host
     set_inherited_value(element);
-    update_puppetclasses(element);
     reload_host_params();
   }
 }
@@ -431,7 +389,6 @@ function os_selected(element) {
     success: function(request) {
       $('#media_select').html(request);
       reload_host_params();
-      reload_puppetclass_params();
     },
   });
   update_provisioning_image();
@@ -525,18 +482,6 @@ function reload_host_params() {
   }
 }
 
-function reload_puppetclass_params() {
-  var host_id = $('form.hostresource-form').data('id');
-  var url2 = $('#params-tab').data('url2');
-  var data = serializeForm().replace('method=patch', 'method=post');
-  if (url2.match('hostgroups')) {
-    data = data + '&hostgroup_id=' + host_id;
-  } else {
-    data = data + '&host_id=' + host_id;
-  }
-  load_with_placeholder('inherited_puppetclasses_parameters', url2, data);
-}
-
 function load_with_placeholder(target, url, data) {
   if (url == undefined) return;
   var placeholder = $(
@@ -561,7 +506,6 @@ function load_with_placeholder(target, url, data) {
 
 function onHostEditLoad() {
   update_interface_table();
-  tfm.hostgroups.checkForUnavailablePuppetclasses();
 
   $('#host-conflicts-modal').modal({ show: 'true', backdrop: 'static' });
   $('#host-conflicts-modal').click(function() {
@@ -636,7 +580,6 @@ $(document).on('change', '.interface_domain', function() {
   );
   interface_domain_selected(this);
   reload_host_params();
-  reload_puppetclass_params();
 });
 
 function clearIpField(parent, childclass) {
diff --git a/app/controllers/concerns/foreman/controller/puppet/hosts_controller_extensions.rb b/app/controllers/concerns/foreman/controller/puppet/hosts_controller_extensions.rb
index 0e885c98195a..6b83785d98fb 100644
--- a/app/controllers/concerns/foreman/controller/puppet/hosts_controller_extensions.rb
+++ b/app/controllers/concerns/foreman/controller/puppet/hosts_controller_extensions.rb
@@ -2,7 +2,6 @@ module Foreman::Controller::Puppet::HostsControllerExtensions
   extend ActiveSupport::Concern
 
   PUPPETMASTER_ACTIONS = [:externalNodes, :lookup]
-  PUPPET_AJAX_REQUESTS = %w{hostgroup_or_environment_selected puppetclass_parameters}
 
   MULTIPLE_EDIT_ACTIONS = %w(select_multiple_environment update_multiple_environment
                              select_multiple_puppet_proxy update_multiple_puppet_proxy
@@ -10,10 +9,7 @@ module Foreman::Controller::Puppet::HostsControllerExtensions
 
   included do
     add_smart_proxy_filters PUPPETMASTER_ACTIONS, :features => ['Puppet']
-    alias_method :ajax_request_for_puppet_host_extensions, :ajax_request
 
-    before_action :ajax_request_for_puppet_host_extensions, :only => PUPPET_AJAX_REQUESTS
-    before_action :taxonomy_scope_for_puppet_host_extensions, :only => PUPPET_AJAX_REQUESTS
     before_action :find_multiple_for_puppet_host_extensions, :only => MULTIPLE_EDIT_ACTIONS
     before_action :validate_multiple_puppet_proxy, :only => :update_multiple_puppet_proxy
     before_action :validate_multiple_puppet_ca_proxy, :only => :update_multiple_puppet_ca_proxy
@@ -23,24 +19,6 @@ module Foreman::Controller::Puppet::HostsControllerExtensions
     set_callback :set_class_variables, :after, :set_puppet_class_variables
   end
 
-  def hostgroup_or_environment_selected
-    refresh_host
-    set_class_variables(@host)
-    Taxonomy.as_taxonomy @organization, @location do
-      if @environment || @hostgroup
-        render :partial => 'puppetclasses/class_selection', :locals => {:obj => @host}
-      else
-        logger.info "environment_id or hostgroup_id is required to render puppetclasses"
-      end
-    end
-  end
-
-  def puppetclass_parameters
-    Taxonomy.as_taxonomy @organization, @location do
-      render :partial => "puppetclasses/classes_parameters", :locals => { :obj => refresh_host}
-    end
-  end
-
   def select_multiple_environment
   end
 
@@ -174,10 +152,6 @@ def set_puppet_class_variables
     @environment = @host.environment
   end
 
-  def taxonomy_scope_for_puppet_host_extensions
-    taxonomy_scope
-  end
-
   def find_multiple_for_puppet_host_extensions
     find_multiple
   end
diff --git a/app/controllers/hostgroups_controller.rb b/app/controllers/hostgroups_controller.rb
index a3b810c70d69..a9b222f3cf0a 100644
--- a/app/controllers/hostgroups_controller.rb
+++ b/app/controllers/hostgroups_controller.rb
@@ -6,7 +6,7 @@ class HostgroupsController < ApplicationController
   include Foreman::Controller::SetRedirectionPath
 
   before_action :find_resource,  :only => [:nest, :clone, :edit, :update, :destroy]
-  before_action :ajax_request,   :only => [:process_hostgroup, :puppetclass_parameters]
+  before_action :ajax_request,   :only => [:process_hostgroup]
   before_action :taxonomy_scope, :only => [:new, :edit, :process_hostgroup]
 
   def index
@@ -83,25 +83,6 @@ def destroy
     process_error(:error_msg => _("Cannot delete group %{current} because it has nested groups.") % { :current => @hostgroup.title })
   end
 
-  def puppetclass_parameters
-    Taxonomy.as_taxonomy @organization, @location do
-      render :partial => "puppetclasses/classes_parameters",
-             :locals => { :obj => refresh_hostgroup }
-    end
-  end
-
-  def environment_selected
-    env_id = params[:environment_id] || params[:hostgroup][:environment_id]
-    return not_found if env_id.to_i > 0 && !(@environment = Environment.find(env_id))
-
-    refresh_hostgroup
-    @hostgroup.environment = @environment if @environment
-
-    @hostgroup.puppetclasses = Puppetclass.where(:id => params[:hostgroup][:puppetclass_ids])
-    @hostgroup.config_groups = ConfigGroup.where(:id => params[:hostgroup][:config_group_ids])
-    render :partial => 'puppetclasses/class_selection', :locals => {:obj => @hostgroup, :type => 'hostgroup'}
-  end
-
   def process_hostgroup
     define_parent
     refresh_hostgroup
diff --git a/app/helpers/puppet_related_helper.rb b/app/helpers/puppet_related_helper.rb
index e85c543eeafd..303fe434379d 100644
--- a/app/helpers/puppet_related_helper.rb
+++ b/app/helpers/puppet_related_helper.rb
@@ -5,68 +5,6 @@ module PuppetRelatedHelper
     overview_buttons_provider :puppet_host_overview_buttons
   end
 
-  def host_puppet_environment_field(form, select_options = {}, html_options = {})
-    select_options = {
-      :include_blank => true,
-      :disable_button => _(HostsAndHostgroupsHelper::INHERIT_TEXT),
-      :disable_button_enabled => inherited_by_default?(:environment_id, @host),
-      :user_set => user_set?(:environment_id)}.deep_merge(select_options)
-
-    html_options = {
-      :data => {
-        :url => hostgroup_or_environment_selected_hosts_path,
-        :host => {
-          :id => @host.id,
-        },
-      }}.deep_merge(html_options)
-
-    puppet_environment_field(
-      form,
-      accessible_resource(@host, :environment),
-      select_options,
-      html_options)
-  end
-
-  def hostgroup_puppet_environment_field(form, select_options = {}, html_options = {})
-    select_options = {
-      :include_blank => blank_or_inherit_f(form, :environment),
-    }.deep_merge(select_options)
-
-    html_options = {
-      :data => {
-        :url => environment_selected_hostgroups_path,
-      }}.deep_merge(html_options)
-
-    puppet_environment_field(
-      form,
-      accessible_resource(@hostgroup, :environment),
-      select_options,
-      html_options)
-  end
-
-  def puppet_environment_field(form, environments_choice, select_options = {}, html_options = {})
-    html_options = {
-      :onchange => "update_puppetclasses(this)",
-      :help_inline => :indicator}.deep_merge(html_options)
-
-    select_f(
-      form,
-      :environment_id,
-      environments_choice,
-      :id,
-      :to_label,
-      select_options,
-      html_options)
-  end
-
-  def interesting_puppetclasses(obj)
-    classes = obj.all_puppetclasses
-    classes_ids = classes.reorder(nil).pluck("puppetclasses.id")
-    class_vars = PuppetclassLookupKey.reorder(nil).joins(:environment_classes).where(:environment_classes => { :puppetclass_id => classes_ids }).distinct.pluck("environment_classes.puppetclass_id")
-
-    classes.where(:id => class_vars)
-  end
-
   def puppet_actions
     actions = []
     if authorized_for(:controller => :hosts, :action => :edit)
diff --git a/app/views/hostgroups/_form.html.erb b/app/views/hostgroups/_form.html.erb
index bff7eed54a2d..9a67ed72d513 100644
--- a/app/views/hostgroups/_form.html.erb
+++ b/app/views/hostgroups/_form.html.erb
@@ -1,5 +1,5 @@
 <%= javascript 'host_edit', 'host_edit_interfaces' %>
-<%= form_for @hostgroup, :html => {:class => 'hostresource-form form-horizontal well', :data => {:id => @hostgroup.try(:id)}} do |f| %>
+<%= form_for @hostgroup, :html => {:class => 'hostresource-form hostgroup-form form-horizontal well', :data => {:id => @hostgroup.try(:id)}} do |f| %>
   <%= base_errors_for @hostgroup %>
 
   <ul class="nav nav-tabs" data-tabs="tabs">
@@ -8,7 +8,7 @@
       <li><a href="#network" data-toggle="tab"><%= _('Network') %></a></li>
       <li><a href="#os" data-toggle="tab"><%= _('Operating System') %></a></li>
     <% end %>
-    <li><a href="#params" id='params-tab' data-url='' data-url2='<%= puppetclass_parameters_hostgroups_path %>' data-toggle="tab"><%= _('Parameters') %></a></li>
+    <li><a href="#params" id='params-tab' data-url='' data-toggle="tab"><%= _('Parameters') %></a></li>
     <%= render_tab_header_for(:main_tabs, :subject => @hostgroup) %>
     <% if show_location_tab? %>
       <li><a href="#locations" data-toggle="tab"><%= _('Locations') %></a></li>
@@ -27,7 +27,6 @@
                       :help_inline => :indicator }) if show_parent?(@hostgroup) %>
       <%= text_f f, :name %>
       <%= textarea_f f, :description, :rows => :auto %>
-      <%= hostgroup_puppet_environment_field f %>
 
       <%= select_f f, :compute_resource_id, accessible_resource(@hostgroup, :compute_resource), :id, :to_label,
           { :include_blank => blank_or_inherit_f(f, :compute_resource, blank_value: _('Bare Metal')) },
@@ -38,7 +37,7 @@
                        { :include_blank => blank_or_inherit_f(f, :compute_profile) },
                        { :label => _("Compute profile") }
                   ) if visible_compute_profiles(@hostgroup).any? %>
-      <%= render_pagelets_for(:main_tab_fields, :hostgroup => @hostgroup, :form => f) %>
+      <%= render_pagelets_for(:main_tab_fields, :subject => @hostgroup, :form => f) %>
       <%= smart_proxy_fields f %>
     </div>
 
@@ -46,7 +45,7 @@
       <fieldset>
         <%= select_f f, :domain_id, accessible_resource(@hostgroup, :domain), :id, :to_label, {:include_blank => blank_or_inherit_f(f, :domain)},
           {:help_inline => :indicator, :label => _("Domain"),
-           :onchange => 'interface_domain_selected(this);', :'data-url' => method_path('domain_selected') } %>
+           :class => 'interface_domain', :'data-url' => method_path('domain_selected') } %>
         <%= select_f f, :subnet_id, domain_subnets(:"Subnet::Ipv4"), :id, :to_label,
                      { :include_blank => domain_subnets(:"Subnet::Ipv4").any? ? blank_or_inherit_f(f, :subnet) : _("No subnets") },
                      { :disabled => domain_subnets(:"Subnet::Ipv4").empty?,
@@ -71,12 +70,6 @@
     </div>
 
     <div class="tab-pane" id="params">
-
-      <fieldset>
-        <h2><%= _('Puppet Class Parameters') %></h2>
-        <%= render 'puppetclasses/classes_parameters', :obj => @hostgroup  %>
-      </fieldset>
-      <br/>
       <% if authorized_for(:controller => "host_editing", :action => "view_params") %>
         <fieldset>
           <% if @hostgroup.parent.present? %>
diff --git a/app/views/hosts/_form.html.erb b/app/views/hosts/_form.html.erb
index 4f61b7180fd7..03db0b3e14c8 100644
--- a/app/views/hosts/_form.html.erb
+++ b/app/views/hosts/_form.html.erb
@@ -4,7 +4,7 @@
 <%= render "hosts/progress" %>
 
 <% Taxonomy.as_taxonomy @organization , @location do %>
-  <%= form_for @host, :url => (@host.new_record? ? hosts_path : host_path(:id => @host.id)), :html => {:class => 'hostresource-form form-horizontal well', :data => {:id => @host.try(:id), :type_changed => !!@host.type_changed?, :submit => 'progress_bar'}} do |f| %>
+  <%= form_for @host, :url => (@host.new_record? ? hosts_path : host_path(:id => @host.id)), :html => {:class => 'hostresource-form host-form form-horizontal well', :data => {:id => @host.try(:id), :type_changed => !!@host.type_changed?, :submit => 'progress_bar'}} do |f| %>
     <%= base_errors_for @host %>
 
     <ul class="nav nav-tabs" data-tabs="tabs">
@@ -21,7 +21,7 @@
 
       <%= render_tab_header_for(:main_tabs, :subject => @host) %>
 
-      <li><a href="#params" id='params-tab' data-url='<%= current_parameters_hosts_path %>' data-url2='<%= puppetclass_parameters_hosts_path %>' data-toggle="tab"><%= _('Parameters') %></a></li>
+      <li><a href="#params" id='params-tab' data-url='<%= current_parameters_hosts_path %>' data-toggle="tab"><%= _('Parameters') %></a></li>
 
       <li><a href="#info" data-toggle="tab"><%= _('Additional Information') %></a></li>
     </ul>
@@ -76,7 +76,7 @@
         </div>
         <% end %>
 
-        <%= render_pagelets_for(:main_tab_fields, :host => @host, :form => f) %>
+        <%= render_pagelets_for(:main_tab_fields, :subject => @host, :form => f) %>
 
         <%= smart_proxy_fields f,
               :can_override => true,
@@ -104,11 +104,6 @@
       <%= render('hosts/unattended', :f => f) if SETTINGS[:unattended] and @host.managed %>
 
       <div class="tab-pane"  id="params">
-        <fieldset>
-          <h2><%= _('Puppet Class Parameters') %></h2>
-          <%= render "puppetclasses/classes_parameters", :obj => @host %>
-        </fieldset>
-        <br/>
         <% if authorized_for(:controller => "host_editing", :action => "view_params") %>
           <fieldset>
             <h2><%= _('Global Parameters') %></h2>
diff --git a/app/views/hosts/puppet/_main_tab_fields.html.erb b/app/views/hosts/puppet/_main_tab_fields.html.erb
deleted file mode 100644
index b07e3f16e329..000000000000
--- a/app/views/hosts/puppet/_main_tab_fields.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= host_puppet_environment_field form %>
diff --git a/app/views/puppetclasses/_classes_parameters.html.erb b/app/views/puppetclasses/_classes_parameters.html.erb
deleted file mode 100644
index 4a8cf462028c..000000000000
--- a/app/views/puppetclasses/_classes_parameters.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<table class="table table-fixed" id="inherited_puppetclasses_parameters">
-  <thead class="white-header">
-    <tr>
-      <th class='col-md-3'><%= _('Puppet Class') %></th>
-      <th class='col-md-3'><%= _('Name') %></th>
-      <th class='col-md-5'><%= _('Value') %></th>
-      <th class='col-md-1 ca'><%= _("Omit") %>&nbsp;<%= omit_help %></th>
-    </tr>
-  </thead>
-  <tbody>
-  <%= render :partial => "puppetclasses/class_parameters",
-    :collection => interesting_puppetclasses(obj),
-    :as => :puppetclass,
-    :locals => { :obj => obj } %>
-  </tbody>
-</table>
diff --git a/config/initializers/puppet.rb b/config/initializers/puppet.rb
index 07f8e19626e6..6f3a7380691f 100644
--- a/config/initializers/puppet.rb
+++ b/config/initializers/puppet.rb
@@ -1,10 +1,3 @@
-# initialize puppet related pagelets
-Pagelets::Manager.with_key "hosts/_form" do |mgr|
-  mgr.add_pagelet :main_tab_fields,
-    :partial => "hosts/puppet/main_tab_fields",
-    :priority => 100
-end
-
 Foreman::Plugin.fact_importer_registry.register(:puppet, PuppetFactImporter, true)
 FactParser.register_fact_parser :puppet, PuppetFactParser, true
 
diff --git a/test/controllers/hostgroups_controller_test.rb b/test/controllers/hostgroups_controller_test.rb
index 61df78ddb17b..f986747527dd 100644
--- a/test/controllers/hostgroups_controller_test.rb
+++ b/test/controllers/hostgroups_controller_test.rb
@@ -152,63 +152,6 @@ def setup_user(operation, type = 'hostgroups')
     assert_template :partial => "common/os_selection/_architecture"
   end
 
-  describe '#environment_selected' do
-    setup do
-      @environment = FactoryBot.create(:environment)
-      @puppetclass = FactoryBot.create(:puppetclass)
-      @hostgroup = FactoryBot.create(:hostgroup, :environment => @environment)
-      @params = {
-        id: @hostgroup.id,
-        hostgroup: {
-          name: @hostgroup.name,
-          environment_id: "",
-          puppetclass_ids: [@puppetclass.id],
-        },
-      }
-    end
-
-    test "should return the selected puppet classes on environment change" do
-      assert_equal 0, @hostgroup.puppetclasses.length
-
-      post :environment_selected, params: @params, session: set_session_user
-      assert_equal(1, assigns(:hostgroup).puppetclasses.length)
-      assert_include assigns(:hostgroup).puppetclasses, @puppetclass
-    end
-
-    context 'no environment_id param is set' do
-      test 'it will take the hostgroup params environment_id' do
-        other_environment = FactoryBot.create(:environment)
-        @params[:hostgroup][:environment_id] = other_environment.id
-
-        post :environment_selected, params: @params, session: set_session_user
-        assert_equal assigns(:environment), other_environment
-      end
-    end
-
-    test 'should not escape lookup values on environment change' do
-      hostgroup = FactoryBot.create(:hostgroup, :environment => @environment, :puppetclass_ids => [@puppetclass.id])
-      lookup_key = FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :key_type => 'array',
-                                     :default_value => ['a', 'b'], :override => true, :puppetclass => @puppetclass)
-      lookup_value = FactoryBot.create(:lookup_value, :lookup_key => lookup_key, :match => "hostgroup=#{hostgroup.name}", :value => ["c", "d"])
-
-      FactoryBot.create(:environment_class, :puppetclass => @puppetclass, :environment => @environment, :puppetclass_lookup_key => lookup_key)
-
-      # sending exactly what the host form would send which is lookup_value.value_before_type_cast
-      lk = {"lookup_values_attributes" => {lookup_key.id.to_s => {"value" => lookup_value.value_before_type_cast, "id" => lookup_value.id, "lookup_key_id" => lookup_key.id, "_destroy" => false}}}
-
-      params = {
-        hostgroup_id: hostgroup.id,
-        hostgroup: hostgroup.attributes.merge(lk),
-      }
-
-      # environment change calls puppetclass_parameters which caused the extra escaping
-      post :puppetclass_parameters, params: params, session: set_session_user, xhr: true
-
-      # if this was escaped during refresh_host the value in response.body after unescapeHTML would include "[\\\"c\\\",\\\"d\\\"]"
-      assert_includes CGI.unescapeHTML(response.body), "[\"c\",\"d\"]"
-    end
-  end
-
   test 'user with view_params rights should see parameters in a hostgroup' do
     hg = FactoryBot.create(:hostgroup, :with_parameter)
     setup_user "edit"
diff --git a/test/controllers/hosts_controller_test.rb b/test/controllers/hosts_controller_test.rb
index 4fcbd74a1427..f73d3a7ebde6 100644
--- a/test/controllers/hosts_controller_test.rb
+++ b/test/controllers/hosts_controller_test.rb
@@ -716,19 +716,13 @@ def setup_multiple_parameters
     assert Host.find(@host2.id).host_parameters[0][:value] == "hello"
   end
 
-  test "parameter details should be html escaped" do
+  test "hostgroup name should be html escaped" do
     hg = FactoryBot.build(:hostgroup, :name => "<script>alert('hacked')</script>")
-    host = FactoryBot.create(:host, :with_puppetclass, :hostgroup => hg)
-    FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param,
-      :override => true, :key_type => 'string',
-      :default_value => "<script>alert('hacked!');</script>",
-      :description => "<script>alert('hacked!');</script>",
-      :puppetclass => host.puppetclasses.first)
+    host = FactoryBot.create(:host, :hostgroup => hg)
     FactoryBot.create(:hostgroup_parameter, :hostgroup => hg)
     get :edit, params: { :id => host.name }, session: set_session_user
     refute response.body.include?("<script>alert(")
     assert response.body.include?("&lt;script&gt;alert(")
-    assert_equal 3, response.body.scan("&lt;script&gt;alert(").size
   end
 
   test "should get errors" do
@@ -1701,56 +1695,6 @@ class Host::Test < Host::Base; end
     end
   end
 
-  describe '#hostgroup_or_environment_selected' do
-    test 'choosing only one of hostgroup or environment renders classes' do
-      post :hostgroup_or_environment_selected, params: {
-        :host_id => nil,
-        :host => {
-          :environment_id => Environment.unscoped.first.id,
-        },
-      }, session: set_session_user, xhr: true
-      assert_response :success
-      assert_template :partial => 'puppetclasses/_class_selection'
-    end
-
-    test 'choosing both hostgroup and environment renders classes' do
-      post :hostgroup_or_environment_selected, params: {
-        :host_id => @host.id,
-        :host => {
-          :environment_id => Environment.unscoped.first.id,
-          :hostgroup_id => Hostgroup.unscoped.first.id,
-        },
-      }, session: set_session_user, xhr: true
-      assert_response :success
-      assert_template :partial => 'puppetclasses/_class_selection'
-    end
-
-    test 'should not escape lookup values on environment change' do
-      host = FactoryBot.create(:host, :with_environment, :with_puppetclass)
-
-      host.environment.locations = [host.location]
-      host.environment.organizations = [host.organization]
-
-      lookup_key = FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :key_type => 'array',
-                                     :default_value => ['a', 'b'], :override => true, :puppetclass => host.puppetclasses.first)
-      lookup_value = FactoryBot.create(:lookup_value, :lookup_key => lookup_key, :match => "fqdn=#{host.fqdn}", :value => ["c", "d"])
-
-      # sending exactly what the host form would send which is lookup_value.value_before_type_cast
-      lk = {"lookup_values_attributes" => {lookup_key.id.to_s => {"value" => lookup_value.value_before_type_cast, "id" => lookup_value.id, "lookup_key_id" => lookup_key.id, "_destroy" => false}}}
-
-      params = {
-        host_id: host.id,
-        host: host.attributes.merge(lk),
-      }
-
-      # environment change calls puppetclass_parameters which caused the extra escaping
-      post :puppetclass_parameters, params: params, session: set_session_user, xhr: true
-
-      # if this was escaped during refresh_host the value in response.body after unescapeHTML would include "[\\\"c\\\",\\\"d\\\"]"
-      assert_includes CGI.unescapeHTML(response.body), "[\"c\",\"d\"]"
-    end
-  end
-
   context '#preview_host_collection' do
     test 'should list hosts' do
       host = FactoryBot.create(:host, :managed)
diff --git a/test/helpers/host_groups_helper_test.rb b/test/helpers/host_groups_helper_test.rb
index 9cee99c6d5eb..b19c1109febf 100644
--- a/test/helpers/host_groups_helper_test.rb
+++ b/test/helpers/host_groups_helper_test.rb
@@ -15,44 +15,6 @@ class HostGroupsHelperTest < ActionView::TestCase
     refute_match /te\/st/, label_with_link(test_group)
   end
 
-  describe 'puppet environment field' do
-    setup do
-      @host = mock('host')
-      @host.stubs(:hostgroup)
-      @host.stubs(:id).returns(999)
-      @f = mock('f')
-      @f.stubs(:object).returns(@host)
-    end
-    test 'it adds new first level attributes' do
-      @f.expects(:collection_select).with do |attr, array, id, method, select_options, html_options|
-        select_options[:test_select_option] == 'test_value1' &&
-        html_options[:test_html_option] == 'test_value2'
-      end
-
-      host_puppet_environment_field(@f, { :test_select_option => 'test_value1' }, { :test_html_option => 'test_value2' })
-    end
-
-    test 'it adds new data attributes' do
-      @f.expects(:collection_select).with do |attr, array, id, method, select_options, html_options|
-        select_options[:test_select_option] == 'test_value1' &&
-        html_options[:data][:test] == 'test_value2'
-      end
-
-      host_puppet_environment_field(@f, { :test_select_option => 'test_value1' }, { :data => { :test => 'test_value2' }})
-    end
-
-    test 'it overrides existing attributes' do
-      @f.expects(:collection_select).with do |attr, array, id, method, select_options, html_options|
-        html_options[:data][:test] == 'some_test_value' &&
-        html_options[:data][:url] == '/test/url'
-      end.returns('')
-
-      html = host_puppet_environment_field(@f, { :disable_button => false }, { :data => { :url => '/test/url', :test => 'some_test_value' }})
-
-      refute_match /btn/, html
-    end
-  end
-
   test "visible_compute_profiles should only show profiles users is authorized to see" do
     role = FactoryBot.create(:role)
     cp = ComputeProfile.first
diff --git a/test/integration/host_js_test.rb b/test/integration/host_js_test.rb
index 32fed96d6416..2538749f98ef 100644
--- a/test/integration/host_js_test.rb
+++ b/test/integration/host_js_test.rb
@@ -1,6 +1,7 @@
 require 'integration_test_helper'
 require 'integration/shared/host_finders'
 require 'integration/shared/host_orchestration_stubs'
+require 'fog/libvirt/models/compute/node'
 
 class HostJSTest < IntegrationTestWithJavascript
   # intermittent failures:
@@ -19,6 +20,7 @@ class HostJSTest < IntegrationTestWithJavascript
   before do
     as_admin { @host = FactoryBot.create(:host, :with_puppet, :managed) }
     Fog.mock!
+    Foreman::Model::Libvirt.any_instance.stubs(:hypervisor).returns(Fog::Libvirt::Compute::Node.new(:cpus => 4))
   end
 
   after do
@@ -91,86 +93,6 @@ class HostJSTest < IntegrationTestWithJavascript
     end
   end
 
-  describe 'edit page' do
-    test 'class parameters and overrides are displayed correctly for strings' do
-      host = FactoryBot.create(:host, :with_puppetclass)
-      FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override,
-        :key_type => 'string', :default_value => true, :path => "fqdn",
-        :puppetclass => host.puppetclasses.first, :overrides => {host.lookup_value_matcher => false})
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert_equal class_params.find("textarea").value, "false"
-      assert class_params.find("textarea:enabled")
-      class_params.find("a[data-tag='remove']").click
-      assert class_params.find("textarea:disabled")
-      click_on_submit
-
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert_equal class_params.find("textarea").value, "true"
-      assert class_params.find("textarea:disabled")
-      class_params.find("a[data-tag='override']").click
-      assert class_params.find("textarea:enabled")
-      class_params.find("textarea").set("false")
-      click_on_submit
-
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert_equal class_params.find("textarea").value, "false"
-      assert class_params.find("textarea:enabled")
-    end
-
-    test 'can override puppetclass lookup values' do
-      host = FactoryBot.create(:host, :with_puppetclass)
-      FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override,
-        :key_type => 'string', :default_value => "true", :path => "fqdn",
-        :puppetclass => host.puppetclasses.first, :overrides => {host.lookup_value_matcher => "false"})
-
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert class_params.has_selector?("a[data-tag='remove']", :visible => :visible)
-      assert class_params.has_selector?("a[data-tag='override']", :visible => :hidden)
-      assert_equal class_params.find("textarea").value, "false"
-      assert class_params.find("textarea:enabled")
-
-      class_params.find("a[data-tag='remove']").click
-      assert class_params.has_selector?("a[data-tag='remove']", :visible => :hidden)
-      assert class_params.has_selector?("a[data-tag='override']", :visible => :visible)
-      assert_equal class_params.find("textarea").value, "true"
-      assert class_params.find("textarea:disabled")
-
-      class_params.find("a[data-tag='override']").click
-      assert class_params.has_selector?("a[data-tag='remove']", :visible => :visible)
-      assert class_params.has_selector?("a[data-tag='override']", :visible => :hidden)
-      assert_equal class_params.find("textarea").value, "true"
-      assert class_params.find("textarea:enabled")
-    end
-
-    test 'correctly override global params' do
-      host = FactoryBot.create(:host)
-
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      id = '#override-param-test' # the global param fixture override button
-      assert page.has_selector?(id)
-      page.find(id).click
-      assert page.has_no_selector?(id)
-      click_on_submit
-
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert page.has_no_selector?(id)
-      page.find('#global_parameters_table a[data-original-title="Remove Parameter"]').click
-      assert page.has_selector?(id)
-    end
-  end
-
   describe "create new host page" do
     test "default primary interface is in the overview table" do
       assert_new_button(hosts_path, "Create Host", new_host_path)
@@ -194,23 +116,19 @@ class HostJSTest < IntegrationTestWithJavascript
     end
 
     test 'choosing a hostgroup overrides other host attributes' do
-      original_hostgroup = FactoryBot.
-        create(:hostgroup, :environment => FactoryBot.create(:environment))
-      overridden_hostgroup = FactoryBot.
-        create(:hostgroup, :environment => FactoryBot.create(:environment))
+      original_hostgroup = FactoryBot.create(:hostgroup, :with_compute_resource)
+      overridden_hostgroup = FactoryBot.create(:hostgroup, :with_compute_resource)
 
       visit new_host_path
       select2(original_hostgroup.name, :from => 'host_hostgroup_id')
       wait_for_ajax
-      click_on_inherit('environment')
+      click_on_inherit('compute_resource')
       select2(overridden_hostgroup.name, :from => 'host_hostgroup_id')
-      assert page.find('#s2id_host_environment_id .select2-chosen').has_text? overridden_hostgroup.environment.name
+      assert page.find('#s2id_host_compute_resource_id .select2-chosen').has_text? overridden_hostgroup.compute_resource.name
     end
 
     test 'choosing a hostgroup with compute resource works' do
-      require 'fog/libvirt/models/compute/node'
-      Foreman::Model::Libvirt.any_instance.stubs(:hypervisor).returns(Fog::Libvirt::Compute::Node.new(:cpus => 4))
-      hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_subnet, :with_domain, :with_compute_resource)
+      hostgroup = FactoryBot.create(:hostgroup, :with_subnet, :with_domain, :with_compute_resource)
       hostgroup.subnet.update!(ipam: IPAM::MODES[:db])
       compute_profile = FactoryBot.create(:compute_profile, :with_compute_attribute, :compute_resource => hostgroup.compute_resource)
       compute_attributes = compute_profile.compute_attributes.where(:compute_resource_id => hostgroup.compute_resource.id).first
@@ -246,7 +164,7 @@ class HostJSTest < IntegrationTestWithJavascript
     end
 
     test 'saves correct values for inherited fields without hostgroup' do
-      env = FactoryBot.create(:environment)
+      compute_resource = FactoryBot.create(:compute_resource, :libvirt)
       os = FactoryBot.create(:ubuntu14_10, :with_associations)
       Nic::Managed.any_instance.stubs(:dns_conflict_detected?).returns(true)
       visit new_host_path
@@ -256,7 +174,7 @@ class HostJSTest < IntegrationTestWithJavascript
       wait_for_ajax
       select2 'Location 1', :from => 'host_location_id'
       wait_for_ajax
-      select2 env.name, :from => 'host_environment_id'
+      select2 compute_resource.name, :from => 'host_compute_resource_id'
 
       click_link 'Operating System'
       wait_for_ajax
@@ -270,20 +188,18 @@ class HostJSTest < IntegrationTestWithJavascript
       switch_form_tab_to_interfaces
       click_button 'Edit'
       select2 domains(:mydomain).name, :from => 'host_interfaces_attributes_0_domain_id'
-      fill_in 'host_interfaces_attributes_0_mac', :with => '00:11:11:11:11:11'
       fill_in 'host_interfaces_attributes_0_ip', :with => '1.1.1.1'
       close_interfaces_modal
       click_on_submit
       find('#host-show') # wait for host details page
 
       host = Host::Managed.search_for('name ~ "myhost1"').first
-      assert_equal env.name, host.environment.name
+      assert_equal compute_resource.name, host.compute_resource.name
     end
 
     test 'sets fields to "inherit" when hostgroup is selected' do
-      env1 = FactoryBot.create(:environment)
-      env2 = FactoryBot.create(:environment)
-      hg = FactoryBot.create(:hostgroup, :environment => env2)
+      compute_resource2 = FactoryBot.create(:compute_resource, :libvirt)
+      hg = FactoryBot.create(:hostgroup, :with_compute_resource)
       os = FactoryBot.create(:ubuntu14_10, :with_associations)
       disable_orchestration
       visit new_host_path
@@ -293,7 +209,7 @@ class HostJSTest < IntegrationTestWithJavascript
       wait_for_ajax
       select2 'Location 1', :from => 'host_location_id'
       wait_for_ajax
-      select2 env1.name, :from => 'host_environment_id'
+      select2 compute_resource2.name, :from => 'host_compute_resource_id'
       select2 hg.name, :from => 'host_hostgroup_id'
       wait_for_ajax
 
@@ -309,7 +225,6 @@ class HostJSTest < IntegrationTestWithJavascript
       switch_form_tab_to_interfaces
       click_button 'Edit'
       select2 domains(:mydomain).name, :from => 'host_interfaces_attributes_0_domain_id'
-      fill_in 'host_interfaces_attributes_0_mac', :with => '00:11:11:11:11:11'
       fill_in 'host_interfaces_attributes_0_ip', :with => '2.3.4.44'
 
       close_interfaces_modal
@@ -317,20 +232,26 @@ class HostJSTest < IntegrationTestWithJavascript
       click_on_submit
 
       host = Host::Managed.search_for('name ~ "myhost1"').first
-      assert_equal env2.name, host.environment.name
+      assert_equal hg.compute_resource.name, host.compute_resource.name
     end
 
     test 'setting host group updates parameters tab' do
-      hostgroup = FactoryBot.create(:hostgroup, :with_parameter)
+      hostgroup1, hostgroup2 = FactoryBot.create_pair(:hostgroup, :with_parameter)
       visit new_host_path
-      select2(hostgroup.name, :from => 'host_hostgroup_id')
 
+      select2(hostgroup1.name, :from => 'host_hostgroup_id')
       wait_for_ajax
 
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
+      switch_form_tab('Parameters')
+      assert page.has_selector?("#inherited_parameters #name_#{hostgroup1.group_parameters.first.name}")
 
-      assert page.has_selector?("#inherited_parameters #name_#{hostgroup.group_parameters.first.name}")
+      switch_form_tab('Host')
+      select2(hostgroup2.name, :from => 'host_hostgroup_id')
+      wait_for_ajax
+
+      switch_form_tab('Parameters')
+      assert page.has_selector?("#inherited_parameters #name_#{hostgroup2.group_parameters.first.name}")
+      assert page.has_no_selector?("#inherited_parameters #name_#{hostgroup1.group_parameters.first.name}")
     end
 
     test 'new parameters can be edited and removed' do
@@ -418,119 +339,38 @@ class HostJSTest < IntegrationTestWithJavascript
   end
 
   describe 'edit page' do
-    test 'fields are not inherited on edit' do
-      env1 = FactoryBot.create(:environment)
-      env2 = FactoryBot.create(:environment)
-      hg = FactoryBot.create(:hostgroup, :environment => env2)
-      host = FactoryBot.create(:host, :with_puppet, :hostgroup => hg)
-      visit edit_host_path(host)
-
-      select2 env1.name, :from => 'host_environment_id'
-      click_on_submit
-
-      host.reload
-      assert_equal env1.name, host.environment.name
-    end
+    test 'changing hostgroup updates parameters tab' do
+      hostgroup1, hostgroup2 = FactoryBot.create_pair(:hostgroup, :with_parameter)
+      host = FactoryBot.create(:host, :hostgroup => hostgroup1)
 
-    test 'user without edit_params permission can save host with params' do
-      host = FactoryBot.create(:host, :with_puppetclass)
-      FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param,
-        :with_override, :key_type => 'string',
-                         :default_value => 'string1', :path => "fqdn\ncomment",
-                         :puppetclass => host.puppetclasses.first,
-                         :overrides => { host.lookup_value_matcher => 'string2' })
-      user = FactoryBot.create(:user, :with_mail)
-      user.update_attribute(:roles, roles(:viewer, :edit_hosts))
-      refute user.can? 'edit_params'
-      set_request_user(user)
       visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert class_params.find('textarea').disabled?
-      assert_equal 2, class_params.all('input:disabled', :visible => :all).count
-      assert_equal 0, class_params.all('input\:not[disabled]', :visible => :all).count
-      click_button('Submit')
-      assert page.has_link?('Edit')
-    end
-
-    test 'shows errors on invalid lookup values' do
-      host = FactoryBot.create(:host, :with_puppetclass)
-      lookup_key = FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override,
-        :key_type => 'real', :default_value => true, :path => "fqdn\ncomment",
-        :puppetclass => host.puppetclasses.first, :overrides => {host.lookup_value_matcher => false})
+      switch_form_tab('Parameters')
+      assert page.has_selector?("#inherited_parameters #name_#{hostgroup1.group_parameters.first.name}")
 
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert page.has_no_selector?('#params td.has-error')
+      switch_form_tab('Host')
+      select2(hostgroup2.name, :from => 'host_hostgroup_id')
 
-      fill_in "host_lookup_values_attributes_#{lookup_key.id}_value", :with => 'invalid'
-      click_button('Submit')
-      assert page.has_selector?('#params td.has-error')
+      switch_form_tab('Parameters')
+      assert page.has_selector?("#inherited_parameters #name_#{hostgroup2.group_parameters.first.name}")
+      assert page.has_no_selector?("#inherited_parameters #name_#{hostgroup1.group_parameters.first.name}")
     end
 
-    test 'choosing a hostgroup does not override other host attributes' do
-      original_hostgroup = FactoryBot.
-        create(:hostgroup, :environment => FactoryBot.create(:environment),
-                           :puppet_proxy => FactoryBot.create(:puppet_smart_proxy))
-
-      # Make host inherit hostgroup environment
-      @host.attributes = @host.apply_inherited_attributes(
-        'hostgroup_id' => original_hostgroup.id)
-      @host.save
-
-      overridden_hostgroup = FactoryBot.
-        create(:hostgroup, :environment => FactoryBot.create(:environment))
-
-      visit edit_host_path(@host)
-      select2(original_hostgroup.name, :from => 'host_hostgroup_id')
-
-      assert_equal original_hostgroup.puppet_proxy.name, find('#s2id_host_puppet_proxy_id .select2-chosen').text
-
-      click_on_inherit('puppet_proxy')
-      select2(overridden_hostgroup.name, :from => 'host_hostgroup_id')
-
-      assert find('#s2id_host_environment_id .select2-chosen').has_text? original_hostgroup.environment.name
-
-      # On host group change, the disabled select will be reset to an empty value - disabled select2 is invisible on chrome
-      assert find('#s2id_host_puppet_proxy_id .select2-chosen', visible: :all).has_text? ''
-    end
+    test 'correctly override global params' do
+      host = FactoryBot.create(:host)
 
-    test 'class parameters and overrides are displayed correctly for booleans' do
-      host = FactoryBot.create(:host, :with_puppetclass)
-      lookup_key = FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override,
-        :key_type => 'boolean', :default_value => 'false', :path => "fqdn",
-        :puppetclass => host.puppetclasses.first, :overrides => {host.lookup_value_matcher => 'false'})
       visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert class_params.has_selector?("a[data-tag='remove']", :visible => :visible)
-      assert class_params.has_selector?("a[data-tag='override']", :visible => :hidden)
-      assert_equal find("#s2id_host_lookup_values_attributes_#{lookup_key.id}_value .select2-chosen").text, "false"
-      select2 "true", :from => "host_lookup_values_attributes_#{lookup_key.id}_value"
+      switch_form_tab('Parameters')
+      id = '#override-param-test' # the global param fixture override button
+      assert page.has_selector?(id)
+      page.find(id).click
+      assert page.has_no_selector?(id)
       click_on_submit
 
       visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert_equal find("#s2id_host_lookup_values_attributes_#{lookup_key.id}_value .select2-chosen").text, "true"
-    end
-
-    test 'changing host group updates parameters tab' do
-      hostgroup1, hostgroup2 = FactoryBot.create_pair(:hostgroup, :with_parameter)
-      host = FactoryBot.create(:host, :hostgroup => hostgroup1)
-
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert page.has_selector?("#inherited_parameters #name_#{hostgroup1.group_parameters.first.name}")
-
-      click_link 'Host'
-      select2(hostgroup2.name, :from => 'host_hostgroup_id')
-
-      click_link 'Parameters'
-      assert page.has_no_selector?("#inherited_parameters #name_#{hostgroup1.group_parameters.first.name}")
-      assert page.has_selector?("#inherited_parameters #name_#{hostgroup2.group_parameters.first.name}")
+      switch_form_tab('Parameters')
+      assert page.has_no_selector?(id)
+      page.find('#global_parameters_table a[data-original-title="Remove Parameter"]').click
+      assert page.has_selector?(id)
     end
   end
 
@@ -634,32 +474,6 @@ class HostJSTest < IntegrationTestWithJavascript
         assert page.find('#host_interfaces_attributes_0_subnet_id option[selected="selected"]', visible: false).has_text? ""
       end
 
-      test "selecting domain updates puppetclass parameters" do
-        disable_orchestration
-        domain = FactoryBot.create(:domain)
-
-        host = FactoryBot.create(:host, :with_puppetclass)
-
-        lookup_key = FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override, :path => "fqdn\ndomain\ncomment",
-                                        :puppetclass => host.puppetclasses.first, :default_value => 'default')
-        LookupValue.create(:value => 'domain', :match => "domain=#{domain.name}", :lookup_key_id => lookup_key.id)
-
-        visit edit_host_path(host)
-        assert page.has_link?('Parameters', :href => '#params')
-        click_link 'Parameters'
-        assert_equal class_params.find("textarea").value, "default"
-
-        switch_form_tab_to_interfaces
-        table.first(:button, 'Edit').click
-
-        select2 domain.name, :from => 'host_interfaces_attributes_0_domain_id'
-        modal.find(:button, "Ok").click
-
-        assert page.has_link?('Parameters', :href => '#params')
-        click_link 'Parameters'
-        assert_equal "domain", class_params.find("textarea").value
-      end
-
       test "selecting type updates interface fields" do
         disable_orchestration
         go_to_interfaces_tab
@@ -732,11 +546,6 @@ class HostJSTest < IntegrationTestWithJavascript
 
   private
 
-  def switch_form_tab_to_interfaces
-    switch_form_tab('Interfaces')
-    disable_interface_modal_animation
-  end
-
   def subnet_and_domain_are_selected(modal, domain)
     modal.assert_selector("#interfaceModal #s2id_host_interfaces_attributes_0_domain_id .select2-chosen",
       text: domain.name)
diff --git a/test/integration/host_test.rb b/test/integration/host_test.rb
index a8fc396032d1..e8eece45a69f 100644
--- a/test/integration/host_test.rb
+++ b/test/integration/host_test.rb
@@ -34,20 +34,6 @@ class HostIntegrationTest < ActionDispatch::IntegrationTest
   end
 
   describe 'edit page' do
-    test 'correctly show hash type overrides' do
-      host = FactoryBot.create(:host, :with_puppetclass)
-      FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param,
-        :with_override, :key_type => 'hash',
-                         :default_value => 'a: b', :path => "fqdn\ncomment",
-                         :puppetclass => host.puppetclasses.first,
-                         :overrides => { host.lookup_value_matcher => 'a: c' })
-
-      visit edit_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      assert_equal class_params.find("textarea").value, "a: c\n"
-    end
-
     test 'displays warning when vm not found by uuid' do
       ComputeResource.any_instance.stubs(:find_vm_by_uuid).raises(ActiveRecord::RecordNotFound)
       host = FactoryBot.create(:host, :with_hostgroup, :with_environment, :on_compute_resource, :managed)
@@ -65,19 +51,6 @@ class HostIntegrationTest < ActionDispatch::IntegrationTest
   end
 
   describe 'clone page' do
-    test 'clones lookup values' do
-      host = FactoryBot.create(:host, :with_puppetclass)
-      lookup_key = FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override,
-        :puppetclass => host.puppetclasses.first, :path => "fqdn\ncomment")
-      lookup_value = LookupValue.create(:value => 'abc', :match => host.lookup_value_matcher, :lookup_key_id => lookup_key.id)
-
-      visit clone_host_path(host)
-      assert page.has_link?('Parameters', :href => '#params')
-      click_link 'Parameters'
-      a = page.find("#host_lookup_values_attributes_#{lookup_key.id}_value")
-      assert_equal lookup_value.value, a.value
-    end
-
     test 'shows no errors on lookup values' do
       host = FactoryBot.create(:host, :with_puppetclass)
       FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override, :path => "fqdn\ncomment",
diff --git a/test/integration/hostgroup_js_test.rb b/test/integration/hostgroup_js_test.rb
index 5ac4aa1461dd..70b3cb71ae10 100644
--- a/test/integration/hostgroup_js_test.rb
+++ b/test/integration/hostgroup_js_test.rb
@@ -8,12 +8,10 @@ class HostgroupJSTest < IntegrationTestWithJavascript
   end
 
   test 'creates a hostgroup with provisioning data' do
-    env = FactoryBot.create(:environment)
     os = FactoryBot.create(:ubuntu14_10, :with_associations)
     visit new_hostgroup_path
 
     fill_in 'hostgroup_name', :with => 'myhostgroup1'
-    select2 env.name, :from => 'hostgroup_environment_id'
     click_link 'Operating System'
     wait_for_ajax
     select2 os.architectures.first.name, :from => 'hostgroup_architecture_id'
@@ -26,9 +24,9 @@ class HostgroupJSTest < IntegrationTestWithJavascript
     fill_in 'hostgroup_root_pass', :with => '12345678'
     click_button 'Submit'
 
-    host = Hostgroup.where(:name => "myhostgroup1").first
-    assert host
-    assert_equal env.name, host.environment.name
+    hostgroup = Hostgroup.where(:name => "myhostgroup1").first
+    refute hostgroup.nil?
+    assert_equal os.id, hostgroup.operatingsystem_id
     assert page.has_current_path? hostgroups_path
   end
 
diff --git a/test/integration/hostgroup_test.rb b/test/integration/hostgroup_test.rb
index 4fef6d79e2de..1f85083221b0 100644
--- a/test/integration/hostgroup_test.rb
+++ b/test/integration/hostgroup_test.rb
@@ -4,15 +4,13 @@ class HostgroupIntegrationTest < ActionDispatch::IntegrationTest
   test "create new page" do
     assert_new_button(hostgroups_path, "Create Host Group", new_hostgroup_path)
     fill_in "hostgroup_name", :with => "staging"
-    select "production", :from => "hostgroup_environment_id"
     assert_submit_button(hostgroups_path)
     assert page.has_link? 'staging'
   end
 
   describe 'edit page' do
     setup do
-      @another_environment = FactoryBot.create(:environment)
-      @hostgroup = FactoryBot.create(:hostgroup, :with_puppetclass)
+      @hostgroup = FactoryBot.create(:hostgroup)
       visit hostgroups_path
       click_link @hostgroup.name
     end
@@ -24,45 +22,6 @@ class HostgroupIntegrationTest < ActionDispatch::IntegrationTest
 
       assert page.has_link? new_hostgroup_name
     end
-
-    describe 'changing the environment' do
-      test 'preserves the puppetclasses' do
-        puppetclasses = @hostgroup.puppetclasses.all
-
-        select @another_environment.name, from: 'hostgroup_environment_id'
-        assert_submit_button(hostgroups_path)
-
-        assert_equal puppetclasses, @hostgroup.puppetclasses.all
-      end
-    end
-  end
-
-  test 'edit shows errors on invalid lookup values' do
-    group = FactoryBot.create(:hostgroup, :with_puppetclass)
-    lookup_key = FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override,
-      :key_type => 'integer', :default_value => true, :path => "hostgroup\ncomment",
-      :puppetclass => group.puppetclasses.first, :overrides => {group.lookup_value_matcher => false})
-
-    visit edit_hostgroup_path(group)
-    assert page.has_link?('Parameters', :href => '#params')
-    click_link 'Parameters'
-    assert page.has_no_selector?('#params .input-group.has-error')
-    fill_in "hostgroup_lookup_values_attributes_#{lookup_key.id}_value", :with => 'invalid'
-    click_button('Submit')
-    assert page.has_selector?('#params td.has-error')
-  end
-
-  test 'clones lookup values' do
-    group = FactoryBot.create(:hostgroup, :with_puppetclass)
-    lookup_key = FactoryBot.create(:puppetclass_lookup_key, :as_smart_class_param, :with_override, :path => "hostgroup\ncomment",
-                                    :puppetclass => group.puppetclasses.first)
-    lookup_value = LookupValue.create(:value => 'abc', :match => group.lookup_value_matcher, :lookup_key_id => lookup_key.id)
-
-    visit clone_hostgroup_path(group)
-    assert page.has_link?('Parameters', :href => '#params')
-    click_link 'Parameters'
-    a = page.find("#hostgroup_lookup_values_attributes_#{lookup_key.id}_value")
-    assert_equal lookup_value.value, a.value
   end
 
   test 'clones root_pass' do
diff --git a/test/integration/shared/host_finders.rb b/test/integration/shared/host_finders.rb
index c29939a41235..0e8fb162fb5f 100644
--- a/test/integration/shared/host_finders.rb
+++ b/test/integration/shared/host_finders.rb
@@ -1,6 +1,11 @@
 module HostFinders
   extend ActiveSupport::Concern
 
+  def switch_form_tab_to_interfaces
+    switch_form_tab('Interfaces')
+    disable_interface_modal_animation
+  end
+
   def disable_interface_modal_animation
     page.evaluate_script('document.getElementById("interfaceModal").classList.remove("fade")')
   end
@@ -9,8 +14,7 @@ def go_to_interfaces_tab
     # go to New Host page
     assert_new_button(hosts_path, "Create Host", new_host_path)
     # switch to interfaces tab
-    page.find(:link, "Interfaces").click
-    disable_interface_modal_animation
+    switch_form_tab_to_interfaces
   end
 
   def close_interfaces_modal
@@ -49,11 +53,7 @@ def multiple_actions_div
     page.find('#submit_multiple')
   end
 
-  def click_on_inherit(attribute)
-    find("#host_#{attribute}_id + .input-group-btn .btn").click
-  end
-
-  def class_params
-    page.find('#inherited_puppetclasses_parameters')
+  def click_on_inherit(attribute, prefix: 'host_')
+    find("##{prefix}#{attribute}_id + .input-group-btn .btn").click
   end
 end
diff --git a/webpack/assets/javascripts/bundle.js b/webpack/assets/javascripts/bundle.js
index a78ee6918094..0597d0969273 100644
--- a/webpack/assets/javascripts/bundle.js
+++ b/webpack/assets/javascripts/bundle.js
@@ -11,7 +11,6 @@ import * as authSource from './foreman_auth_source';
 import * as tools from './foreman_tools';
 import * as users from './foreman_users';
 import * as sshKeys from './foreman_ssh_keys';
-import * as hostgroups from './foreman_hostgroups';
 import * as httpProxies from './foreman_http_proxies';
 import * as toastNotifications from './foreman_toast_notifications';
 import * as numFields from './jquery.ui.custom_spinners';
@@ -41,7 +40,6 @@ window.tfm = Object.assign(window.tfm || {}, {
   users,
   computeResource: compute,
   sshKeys,
-  hostgroups,
   hosts,
   httpProxies,
   toastNotifications,
diff --git a/webpack/assets/javascripts/foreman_hostgroups.js b/webpack/assets/javascripts/foreman_hostgroups.js
deleted file mode 100644
index 7673415daea0..000000000000
--- a/webpack/assets/javascripts/foreman_hostgroups.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import $ from 'jquery';
-import { translate as __ } from './react_app/common/I18n';
-
-export function checkForUnavailablePuppetclasses() {
-  const unavailableClasses = $(
-    '#puppet_klasses #selected_classes .unavailable'
-  );
-  const puppetKlassesTab = $('#puppet_klasses');
-  const tab = puppetKlassesTab
-    .closest('form')
-    .find('.nav-tabs a[href="#puppet_klasses"]');
-  const warningMessage = __(
-    'Some Puppet Classes are unavailable in the selected environment'
-  );
-  const warning = `<div class="alert alert-warning" id="puppetclasses_unavailable_warning">
-      <span class="pficon pficon-warning-triangle-o"></span>
-      ${warningMessage}
-    </span>`;
-
-  if (unavailableClasses.size() > 0) {
-    tab.prepend('<span class="pficon pficon-warning-triangle-o"></span> ');
-    puppetKlassesTab.prepend(warning);
-  } else {
-    puppetKlassesTab.find('#puppetclasses_unavailable_warning').remove();
-    tab.find('.pficon-warning-triangle-o').remove();
-  }
-}
diff --git a/webpack/assets/javascripts/foreman_hostgroups.test.js b/webpack/assets/javascripts/foreman_hostgroups.test.js
deleted file mode 100644
index 7f2d37ea5ea2..000000000000
--- a/webpack/assets/javascripts/foreman_hostgroups.test.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/* eslint-disable jquery/no-size */
-
-import $ from 'jquery';
-
-import { checkForUnavailablePuppetclasses } from './foreman_hostgroups';
-
-jest.unmock('jquery');
-jest.unmock('./foreman_hostgroups');
-
-describe('checkForUnavailablePuppetclasses', () => {
-  beforeEach(() => {
-    document.body.innerHTML = `<div>
-        <ul class="nav-tabs">
-          <li><a href="#puppet_klasses" data-toggle="tab">Puppet Classes</a></li>
-        </ul>
-        <div class="tab-content">
-          <form>
-            <div class="tab-pane active" id="hostgroup">
-                <div class="form-group">
-                  <div>
-                    <input id="hostgroup_environment_id"/>
-                  </div>
-                  <span class="help-block"></span>
-                </div>
-            </div>
-            <div class="tab-pane" id="puppet_klasses">
-              <div id="selected_classes"></div>
-            </div>
-          </form>
-        </div>
-      </div>`;
-  });
-
-  it('adds a warning if an unavailable class is found', () => {
-    $('#selected_classes').append(
-      '<li class="unavailable">Unavailable Class</li>'
-    );
-
-    checkForUnavailablePuppetclasses();
-    expect($('#puppetclasses_unavailable_warning').size()).toBe(1);
-  });
-
-  it('does not add a warning if no unavailable classes are found', () => {
-    $('#hostgroup .help-block').empty();
-    $('#selected_classes').empty();
-
-    checkForUnavailablePuppetclasses();
-    expect(
-      $('#hostgroup .help-block')
-        .first()
-        .children()
-        .size()
-    ).toBe(0);
-  });
-
-  it('adds a warning sign to the tab if unavailable classes are found', () => {
-    $('#selected_classes').append(
-      '<li class="unavailable">Unavailable Class</li>'
-    );
-    checkForUnavailablePuppetclasses();
-    setTimeout(() => {
-      expect($('a .pficon').size()).toBe(1);
-    }, 100);
-  });
-});