diff --git a/package/yast2-firewall.changes b/package/yast2-firewall.changes
index 7f0968a..f7dd873 100644
--- a/package/yast2-firewall.changes
+++ b/package/yast2-firewall.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 21 07:37:21 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
+
+- Unify YaST module mocking in unit tests (related to bsc#1194784)
+- 4.4.2
+
 -------------------------------------------------------------------
 Wed Jun 16 12:33:45 UTC 2021 - José Iván López González <jlopez@suse.com>
 
diff --git a/package/yast2-firewall.spec b/package/yast2-firewall.spec
index 73c1c10..a64a8e4 100644
--- a/package/yast2-firewall.spec
+++ b/package/yast2-firewall.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firewall
-Version:        4.4.1
+Version:        4.4.2
 Release:        0
 Summary:        YaST2 - Firewall Configuration
 Group:          System/YaST
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 87c754c..14feecf 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -40,18 +40,6 @@ def require(path)
   end
 end
 
-# stub module to prevent its Import
-# Useful for modules from different yast packages, to avoid build dependencies
-def stub_module(name, fake_class = nil)
-  fake_class = Class.new { def self.fake_method; end } if fake_class.nil?
-  Yast.const_set name.to_sym, fake_class
-end
-
-# stub classes from other modules to speed up a build
-# rubocop:disable Style/SingleLineMethods
-stub_module("AutoInstall", Class.new { def self.issues_list; []; end })
-# rubocop:enable Style/SingleLineMethods
-
 # some tests have translatable messages
 ENV["LANG"] = "en_US.UTF-8"
 ENV["LC_ALL"] = "en_US.UTF-8"
@@ -90,3 +78,6 @@ def stub_module(name, fake_class = nil)
     ]
   end
 end
+
+# stub classes from other modules to avoid build dependencies
+Yast::RSpec::Helpers.define_yast_module("AutoInstall", methods: [:issues_list])