diff --git a/testsuite/eval.good b/testsuite/eval.good
deleted file mode 100644
index 4d2a8ff..0000000
--- a/testsuite/eval.good
+++ /dev/null
@@ -1,40 +0,0 @@
-abcd
----
-abcd
----
-abcd
----
-17380: 2 2 5 11 79
-cpu
----
-17380: 2 2 5 11 79
-cpu
----
-17380: 2 2 5 11 79
-cpu
----
- abcd
----
- abcd
----
- abcd
----
-17380: 2 2 5 11 79
- cpu
----
-17380: 2 2 5 11 79
- cpu
----
-17380: 2 2 5 11 79
- cpu
----
-Doing some more tests -----------------------
-17380: 2 2 5 11 79
----
-./sed/sed 1q eval.in2
----
-17380: 2 2 5 11 79
----
-./sed/sed 1q eval.in2
----
-./sed/sed 1q eval.in2
diff --git a/testsuite/eval.inp b/testsuite/eval.inp
deleted file mode 100644
index 6c3df08..0000000
--- a/testsuite/eval.inp
+++ /dev/null
@@ -1,5 +0,0 @@
-17380: 2 2 5 11 79
-abcd
-cpu
- abcd
- cpu
diff --git a/testsuite/eval.sed b/testsuite/eval.sed
deleted file mode 100644
index 1223419..0000000
--- a/testsuite/eval.sed
+++ /dev/null
@@ -1,46 +0,0 @@
-1d
-
- #Try eval command
- /cpu/!b2
- e./sed/sed 1q eval.in2
-
-:2
-p
-i---
-h
-
- #Try eval option
- s,.* *cpu *,./sed/sed 1q eval.in2; echo "&",e
-
-:3
-p
-g
-i---
-
- h
- #Try eval option with print
- s,.* *cpu.*,./sed/sed 1q eval.in2,ep
- g
-
-
-:4
-p
-i---
-
-$!d
-
-#Do some more tests
-s/.*/Doing some more tests -----------------------/p
-s,.*,./sed/sed 1q eval.in2,ep
-i---
-s,.*,./sed/sed 1q eval.in2,pe
-i---
-s,.*,./sed/sed 1q eval.in2,
-h
-e
-p
-g
-i---
-s/^/echo /ep
-i---
-s/^fubar$/echo wozthis/e
diff --git a/testsuite/eval.sh b/testsuite/eval.sh
new file mode 100755
index 0000000..d2df706
--- /dev/null
+++ b/testsuite/eval.sh
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# Test runner for old 'eval' test
+
+# Copyright (C) 2017 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+. "${srcdir=.}/testsuite/init.sh"; path_prepend_ ./sed
+print_ver_ sed
+
+fail=0
+
+
+cat << \EOF > eval-in || framework_failure_
+17380: 2 2 5 11 79
+abcd
+cpu
+ abcd
+ cpu
+EOF
+
+# create a copy of the input file.
+# Keep the name 'eval.in2' - it is used in the 'eval' commands in the
+# sed program below.
+cp eval-in eval.in2 || framework_failure_
+
+
+# The sed program - containing multiple 'e' (eval) commands.
+# NOTE: the program executes 'sed' using 'e' commands - and
+# assumes GNU sed is in the $PATH (which is the case here).
+cat << \EOF > eval.sed || framework_failure_
+1d
+
+ #Try eval command
+ /cpu/!b2
+ esed 1q eval.in2
+
+:2
+p
+i---
+h
+
+ #Try eval option
+ s,.* *cpu *,sed 1q eval.in2; echo "&",e
+
+:3
+p
+g
+i---
+
+ h
+ #Try eval option with print
+ s,.* *cpu.*,sed 1q eval.in2,ep
+ g
+
+
+:4
+p
+i---
+
+$!d
+
+#Do some more tests
+s/.*/Doing some more tests -----------------------/p
+s,.*,sed 1q eval.in2,ep
+i---
+s,.*,sed 1q eval.in2,pe
+i---
+s,.*,sed 1q eval.in2,
+h
+e
+p
+g
+i---
+s/^/echo /ep
+i---
+s/^fubar$/echo wozthis/e
+EOF
+
+
+# The expected output file
+cat << \EOF > eval-exp || framework_failure_
+abcd
+---
+abcd
+---
+abcd
+---
+17380: 2 2 5 11 79
+cpu
+---
+17380: 2 2 5 11 79
+cpu
+---
+17380: 2 2 5 11 79
+cpu
+---
+ abcd
+---
+ abcd
+---
+ abcd
+---
+17380: 2 2 5 11 79
+ cpu
+---
+17380: 2 2 5 11 79
+ cpu
+---
+17380: 2 2 5 11 79
+ cpu
+---
+Doing some more tests -----------------------
+17380: 2 2 5 11 79
+---
+sed 1q eval.in2
+---
+17380: 2 2 5 11 79
+---
+sed 1q eval.in2
+---
+sed 1q eval.in2
+EOF
+
+
+
+
+sed -f eval.sed eval-in > eval-out || fail=1
+remove_cr_inplace eval-out
+compare eval-exp eval-out || fail=1
+
+
+Exit $fail
diff --git a/testsuite/local.mk b/testsuite/local.mk
index 10245ea..38cfe13 100644
--- a/testsuite/local.mk
+++ b/testsuite/local.mk
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-CLEANFILES += tmp* core *.core $(EXTRA_PROGRAMS) *.*out *.log eval.in2
+CLEANFILES += tmp* core *.core $(EXTRA_PROGRAMS) *.*out *.log
TEST_EXTENSIONS = .sh .pl
@@ -89,6 +89,7 @@ T += testsuite/8bit.sh \
testsuite/binary.sh \
testsuite/bsd-wrapper.sh \
testsuite/dc.sh \
+ testsuite/eval.sh \
testsuite/help.sh \
testsuite/utf8-ru.sh \
testsuite/uniq.sh \
@@ -117,7 +118,6 @@ endif
SEDTESTS += testsuite/newjis \
testsuite/noeolw \
testsuite/madding testsuite/mac-mf \
- testsuite/eval \
testsuite/distrib testsuite/8to7 \
testsuite/stdin \
testsuite/badenc testsuite/inplace-hold
@@ -199,9 +199,6 @@ EXTRA_DIST += \
testsuite/distrib.inp \
testsuite/distrib.sed \
testsuite/distrib.sh \
- testsuite/eval.good \
- testsuite/eval.inp \
- testsuite/eval.sed \
testsuite/mac-mf.good \
testsuite/mac-mf.inp \
testsuite/mac-mf.sed \