diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
index 9ce58cd28..e6cb9475e 100644
--- a/package/yast2-bootloader.spec
+++ b/package/yast2-bootloader.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-bootloader
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,41 +23,41 @@ Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 
-Group:	        System/YaST
-License:        GPL-2.0+
 Url:            http://github.com/yast/yast-bootloader
-BuildRequires:	yast2-devtools >= 3.1.10
-BuildRequires:	yast2 >= 3.1.112
+BuildRequires:  yast2 >= 3.1.112
+BuildRequires:  yast2-devtools >= 3.1.10
+BuildRequires:  yast2-ruby-bindings >= 1.0.0
+BuildRequires:  yast2-storage
+BuildRequires:  rubygem(cfa_grub2)
 BuildRequires:  rubygem(rspec)
 BuildRequires:  rubygem(yast-rake)
-BuildRequires:  rubygem(cfa_grub2)
-BuildRequires:  yast2-storage
-BuildRequires:  yast2-ruby-bindings >= 1.0.0
 PreReq:         /bin/sed %fillup_prereq
 # Base classes for inst clients
-Requires:	yast2 >= 3.1.112
-Requires:	yast2-packager >= 2.17.24
-Requires:	yast2-pkg-bindings >= 2.17.25
-Requires:	yast2-core >= 2.18.7
-Requires:       yast2-storage >= 2.18.18
 Requires:       parted
+Requires:       yast2 >= 3.1.112
+Requires:       yast2-core >= 2.18.7
+Requires:       yast2-packager >= 2.17.24
+Requires:       yast2-pkg-bindings >= 2.17.25
+Requires:       yast2-storage >= 2.18.18
 Requires:       rubygem(cfa_grub2)
 
 %ifarch %ix86 x86_64
-Requires:	syslinux
+Requires:       syslinux
 %endif
 
 Requires:       yast2-ruby-bindings >= 1.0.0
 
-Summary:	YaST2 - Bootloader Configuration
+Summary:        YaST2 - Bootloader Configuration
+License:        GPL-2.0+
+Group:          System/YaST
 
 %description
 This package contains the YaST2 component for bootloader configuration.
 
 %package devel-doc
 Requires:       yast2-bootloader = %version
-Group:          System/YaST
 Summary:        YaST2 - Bootloader Configuration - Development Documentation
+Group:          System/YaST
 
 %description devel-doc
 This package contains development documentation for using the API
@@ -113,3 +113,5 @@ rake install DESTDIR="%{buildroot}"
 %files devel-doc
 %defattr(-,root,root)
 %doc %{yast_docdir}/autodocs
+
+%changelog
diff --git a/test/grub2base_test.rb b/test/grub2base_test.rb
index dbdec7904..5270d6145 100644
--- a/test/grub2base_test.rb
+++ b/test/grub2base_test.rb
@@ -290,7 +290,8 @@
       expect(subject.grub_default.distributor).to eq ""
     end
 
-    it "proposes serial console from its usage on kernel command line" do
+    it "proposes serial console from its usage on kernel command line on non-s390" do
+      allow(Yast::Arch).to receive(:architecture).and_return("x86_64")
       kernel_params = "console=ttyS1,4800n8"
       allow(Yast::Kernel).to receive(:GetCmdLine).and_return(kernel_params)