diff --git a/grep.changes b/grep.changes
index b77ae8c..3601e06 100644
--- a/grep.changes
+++ b/grep.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 26 13:22:50 UTC 2015 - schwab@suse.de
+
+- testsuite.patch: also disable long-pattern-perf test
+
 -------------------------------------------------------------------
 Tue Nov  3 13:45:34 UTC 2015 - schwab@suse.de
 
diff --git a/testsuite.patch b/testsuite.patch
index c2a56a0..f88e559 100644
--- a/testsuite.patch
+++ b/testsuite.patch
@@ -1,13 +1,54 @@
-Index: grep-2.22/tests/mb-non-UTF8-performance
-===================================================================
---- grep-2.22.orig/tests/mb-non-UTF8-performance
-+++ grep-2.22/tests/mb-non-UTF8-performance
-@@ -18,6 +18,8 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-+exit 77
-+
- . "${srcdir=.}/init.sh"; path_prepend_ ../src
+From e938d22e2131972a6e9eaddbf850c6a04a4f750c Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@fb.com>
+Date: Wed, 4 Nov 2015 10:57:07 -0800
+Subject: [PATCH] tests: mark performance-related tests as expensive
+
+These performance-related tests are slightly failure prone due to
+varying system load during the two runs.
+Marking these tests as "expensive" makes it so they are no longer run
+via "make check". You can still run them via make "check-expensive".
+This makes them less likely to be run by regular users.
+* tests/long-pattern-perf: Use expensive_.
+* tests/mb-non-UTF8-performance: Likewise.
+Reported by Jaroslav Skarvada in http://debbugs.gnu.org/21826
+and by Andreas Schwab in http://debbugs.gnu.org/21812.
+---
+ tests/long-pattern-perf       | 5 +++++
+ tests/mb-non-UTF8-performance | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf
+index c222c02..2c9d080 100755
+--- a/tests/long-pattern-perf
++++ b/tests/long-pattern-perf
+@@ -20,6 +20,11 @@
  
  fail=0
+ 
++# This test is susceptible to failure due to differences in
++# system load during the two test runs, so we'll mark it as
++# "expensive", making it less likely to be run by regular users.
++expensive_
++
+ echo x > in || framework_failure_
+ # We could use seq -s '' (avoiding the tr filter), but I
+ # suspect some version of seq does not honor that option.
+diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
+index 228361d..9bd5d39 100755
+--- a/tests/mb-non-UTF8-performance
++++ b/tests/mb-non-UTF8-performance
+@@ -22,6 +22,11 @@
+ 
+ fail=0
+ 
++# This test is susceptible to failure due to differences in
++# system load during the two test runs, so we'll mark it as
++# "expensive", making it less likely to be run by regular users.
++expensive_
++
+ # Make this large enough so that even on high-end systems
+ # it incurs at least 5-10ms of user time.
+ yes $(printf '%078d' 0) | head -400000 > in || framework_failure_
+-- 
+2.6.3
+