diff --git a/dejagnu.spec b/dejagnu.spec
index 596ab1e..9e02440 100644
--- a/dejagnu.spec
+++ b/dejagnu.spec
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv3+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -10,6 +10,7 @@ URL: http://www.gnu.org/software/dejagnu/
 Requires: expect
 BuildArch: noarch
 BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires: expect screen texinfo
 
 %description
@@ -33,10 +34,12 @@ echo ============TESTING===============
 # running the test under screen and communicating back to test runner
 # via temporary file.  If you have better idea, we accept patches.
 TMP=`mktemp`
+export SCREENDIR=`mktemp -d`
 screen -D -m sh -c '(make check RUNTESTFLAGS="RUNTEST=`pwd`/runtest"; echo $?) >> '$TMP
 RESULT=`tail -n 1 $TMP`
 cat $TMP
 rm -f $TMP
+rm -rf $SCREENDIR
 echo ============END TESTING===========
 exit $RESULT
 
@@ -66,6 +69,11 @@ fi
 %{_infodir}/dejagnu*
 
 %changelog
+* Tue Jul 24 2018 Matej Mužila <mmuzila@redhat.com> - 1:1.6.1-4
+- Fix tests
+- Add BuildRequires: gcc-c++
+- Resolves: #1603770
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild