diff --git a/nokogiri-pr2938-minitest-5_19.patch b/nokogiri-pr2938-minitest-5_19.patch
deleted file mode 100644
index 5622b55..0000000
--- a/nokogiri-pr2938-minitest-5_19.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a29042b0c0dbdc1b488a97dd6d6dd88d4b583c05 Mon Sep 17 00:00:00 2001
-From: Mike Dalessio <mike.dalessio@gmail.com>
-Date: Thu, 3 Aug 2023 17:52:36 -0400
-Subject: [PATCH 2/3] style: prefer Minitest to MiniTest
-
-since Minitest 5.19 doesn't load it by default
----
- .github/ISSUE_TEMPLATE/1-bug-report.md | 2 +-
- CONTRIBUTING.md                        | 2 +-
- test/helper.rb                         | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
-index 297cd4de42..79d4bf6ff1 100644
---- a/.github/ISSUE_TEMPLATE/1-bug-report.md
-+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
-@@ -32,7 +32,7 @@ Here's an example of how you might structure such a script:
- require 'nokogiri'
- require 'minitest/autorun'
- 
--class Test < MiniTest::Spec
-+class Test < Minitest::Spec
-   describe "Node#css" do
-     it "should find a div using chained classes" do
-       html = <<~HEREDOC
-diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
-index 336c9c5c14..a0f844d16e 100644
---- a/CONTRIBUTING.md
-+++ b/CONTRIBUTING.md
-@@ -124,7 +124,7 @@ Note that `rake test` does not compile the native extension, and this is intenti
- bundle exec rake compile test
- ```
- 
--To run a focused test, use MiniTest's `TESTOPTS`:
-+To run a focused test, use Minitest's `TESTOPTS`:
- 
- ``` sh
- bundle exec rake compile test TESTOPTS="-n/test_last_element_child/"
-diff --git a/test/helper.rb b/test/helper.rb
-index ed3133c6e8..8d4569e87c 100644
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -128,7 +128,7 @@ class TestBenchmark < Minitest::BenchSpec
-   end
- 
-   # rubocop:disable Style/ClassVars
--  class TestCase < MiniTest::Spec
-+  class TestCase < Minitest::Spec
-     include TestBase
- 
-     COMPACT_EVERY = 20
-@@ -272,7 +272,7 @@ def assert_not_send(send_ary, m = nil)
-     def pending(msg)
-       begin
-         yield
--      rescue MiniTest::Assertion
-+      rescue Minitest::Assertion
-         skip("pending #{msg} [#{caller(2..2).first}]")
-       end
-       flunk("pending test unexpectedly passed: #{msg} [#{caller(1..1).first}]")
-
-
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index c4d445c..ab4c54c 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -1,7 +1,7 @@
-%global	mainver		1.15.3
+%global	mainver		1.15.4
 #%%global	prever		.rc4
 
-%global	baserelease		4
+%global	baserelease		1
 %global	prerpmver		%(echo "%{?prever}" | sed -e 's|\\.||g')
 
 %global	gem_name	nokogiri
@@ -29,8 +29,6 @@ Source1:	rubygem-%{gem_name}-%{version}%{?prever}-full.tar.gz
 Source2:	nokogiri-create-full-tarball.sh
 # Shut down libxml2 version unmatching warning
 Patch0:	%{name}-1.11.0.rc4-shutdown-libxml2-warning.patch
-# https://github.com/sparklemotion/nokogiri/pull/2938
-Patch1:	%{gem_name}-pr2938-minitest-5_19.patch
 BuildRequires:	ruby(release)
 BuildRequires:	ruby(rubygems)
 ##
@@ -83,7 +81,6 @@ mv ../%{gem_name}-%{version}.gemspec .
 
 # patches
 %patch -P0 -p1
-%patch -P1 -p1
 
 # remove bundled external libraries
 sed -i \
@@ -269,6 +266,9 @@ popd
 %doc	%{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/
 
 %changelog
+* Sat Aug 12 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.15.4-1
+- 1.15.4
+
 * Sun Aug  6 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.15.3-4
 - Prefer upstream patch for the previous change
 
diff --git a/sources b/sources
index 452199e..dbd6165 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nokogiri-1.15.3.gem) = d5159f0ce8eb43e5dd65138cb17519bd15caec36889fde3fcef53e64261172e69d3676c0119c5ab247e19d5f8e8f03c3bbde2285cd8d0974cbf8a4be5e30c58d
-SHA512 (rubygem-nokogiri-1.15.3-full.tar.gz) = bf460d2d588b9aecc07611709192bc2b604df99ff235c20eb7c6dc18b0e72f0b992d41ee2a5cddc8b0c3f5f665072c936da285ec01b33e6e132588f1914ffaf8
+SHA512 (nokogiri-1.15.4.gem) = 94587e0f87a44dcbaef3dfd29df0fb7cba9458a36fd4a486432b2718e93afc712fefce2a3618ccef6bb96a6578daca043ecd5c02de8bca3206b801cda1403c4c
+SHA512 (rubygem-nokogiri-1.15.4-full.tar.gz) = 6655e2560a2d39f95859838fb6d8d0d5dcb74f5bf82cd06f183a39e94294df0eab4070ecc7f4a9002508e5f5171c6de7f692a5e0c3d83a79718b58b64f0462dd