diff --git a/tcsh-6.17.00-testsuite.patch b/tcsh-6.17.00-testsuite.patch
new file mode 100644
index 0000000..aff70ef
--- /dev/null
+++ b/tcsh-6.17.00-testsuite.patch
@@ -0,0 +1,49 @@
+diff -up tcsh-6.17.00/tests/lexical.at.testsuite tcsh-6.17.00/tests/lexical.at
+--- tcsh-6.17.00/tests/lexical.at.testsuite	2008-10-17 21:56:59.000000000 +0200
++++ tcsh-6.17.00/tests/lexical.at	2010-04-08 16:27:27.286413600 +0200
+@@ -30,15 +30,15 @@ AT_CLEANUP
+ 
+ AT_SETUP([Comments])
+ 
+-AT_CHECK([echo 'echo OK#comment' | tcsh -f], , [OK
++AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK
+ ])
+ 
+-AT_CHECK([tcsh -f -c 'echo #no comment'], ,
+-[#no comment
++AT_CHECK([tcsh -f -c 'echo @%:@no comment'], ,
++[@%:@no comment
+ ])
+ 
+ AT_DATA([comment2.csh],
+-[[echo testing...#\
++[[echo testing...@%:@\
+ OK
+ ]])
+ AT_CHECK([tcsh -f comment2.csh], ,
+@@ -194,7 +194,7 @@ AT_DATA([nohist.csh],
+ [[echo ! space !	tab != "!(" newline !
+ ]])
+ AT_CHECK([tcsh -f nohist.csh], ,
+-[! space ! tab != !( newline !
++[! space ! tab != !@{:@ newline !
+ ])
+ 
+ AT_CLEANUP
+@@ -230,14 +230,14 @@ AT_CHECK([tcsh -f -q -i < negative.csh],
+ [echo 1
+ ])
+ 
+-AT_CHECK([echo 'echo !#:0' | tcsh -f -q -i], ,
++AT_CHECK([echo 'echo !@%:@:0' | tcsh -f -q -i], ,
+ [> echo
+ > exit
+ ],
+ [echo echo
+ ])
+ 
+-AT_CHECK([echo 'echo !#:1' | tcsh -f -q -i], 1,
++AT_CHECK([echo 'echo !@%:@:1' | tcsh -f -q -i], 1,
+ [> > exit
+ ],
+ [Bad ! arg selector.
diff --git a/tcsh.spec b/tcsh.spec
index 32896f7..a00ca21 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.17
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
@@ -25,6 +25,7 @@ Patch14: tcsh-6.17.00-glob-automount.patch
 Patch15: tcsh-6.17.00-history.patch
 # Accepted by upstream:
 Patch16: tcsh-6.17.00-printexitvalue.patch
+Patch17: tcsh-6.17.00-testsuite.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -56,6 +57,7 @@ like syntax.
 %patch14 -p1 -b .glob-automount
 %patch15 -p1 -b .history
 %patch16 -p1 -b .printexitvalue
+%patch17 -p1 -b .testsuite
 
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -129,6 +131,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Apr 14 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.17-8
+- Fix testsuite
+
 * Mon Mar  1 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.17-7
 - Ship README file