diff --git a/tests/seteps/Makefile b/tests/seteps/Makefile
index b0e0dce50c184b94a6f6cd9e5da994d3993c328b..bd0a055a8c02c311235a3f565d62b4f3191970ba 100644
--- a/tests/seteps/Makefile
+++ b/tests/seteps/Makefile
@@ -17,12 +17,12 @@ all: build-original/setepsdriver build-f77/setepsdriver build-f90/setepsdriver b
 build-f77/seteps.o:       ../../source/split-f77/seteps.f
 	$(FC) $(FFLAGS) -Wno-conversion -Wno-compare-reals -c -o $@ $<
 
-build-f90/seteps.o:       seteps-old.f90
+build-f90/seteps.o:       setepsdriver-f90-seteps.f90
 	$(FC) $(FFLAGS) -c -Jbuild-f90 -o $@ $<
-build-f90/seteps_mod.mod: seteps-old.f90
+build-f90/seteps_mod.mod: setepsdriver-f90-seteps.f90
 	$(FC) $(FFLAGS) -c -Jbuild-f90 -o build-f90/seteps.o $<
 
-build-f90-new/seteps.o:       ../../source/f90/seteps.f90
+build-f90-new/seteps.o:   ../../source/f90/seteps.f90
 	$(FC) $(FFLAGS) -c -Jbuild-f90-new -o $@ $<
 build-f90-new/seteps_mod.mod: ../../source/f90/seteps.f90
 	$(FC) $(FFLAGS) -c -Jbuild-f90-new -o build-f90/seteps.o $<
@@ -39,8 +39,8 @@ build-WFW/seteps.o:       $(wildcard ../../source/WFW\\ seteps/myEels20-seteps.f
 build-WFW/seteps_mod.mod: $(wildcard ../../source/WFW\\ seteps/myEels20-seteps.f90)
 	$(FC) $(FFLAGS) -c -Jbuild-WFW -o build-WFW/seteps.o '$(MYEELS20_SETEPS)'
 
-build-original/setepsdriver: setepsdriver-original.f90 seteps-original.for
-	$(FC) $(FFLAGS) -o $@ setepsdriver-original.f90 seteps-original.for
+build-original/setepsdriver: setepsdriver-original.f90 setepsdriver-original-seteps.for
+	$(FC) $(FFLAGS) -o $@ setepsdriver-original.f90 setepsdriver-original-seteps.for
 
 build-f77/setepsdriver: setepsdriver-f77.f90 build-f77/seteps.o
 	$(FC) $(FFLAGS) -o $@ $^
@@ -89,15 +89,17 @@ test: build-original/setepsdriver build-f90/setepsdriver build-f90-new/setepsdri
 		rm build-f90-new/setepsIn.txt ; \
 	done
 
-clean: cleanbuild cleanresults
+clean: buildclean resultsclean
 
-cleanbuild:
+buildclean:
+	rm -rf build-original/*
 	rm -rf build-f77/*
 	rm -rf build-f90/*
 	rm -rf build-f90-new/*
 	rm -rf build-WFW/*
 
-cleanresults:
+resultsclean:
+	rm -rf results-original/*
 	rm -rf results-f77/*
 	rm -rf results-f90/*
 	rm -rf results-f90-new-1/*
diff --git a/tests/seteps/seteps-old.f90 b/tests/seteps/setepsdriver-f90-seteps.f90
similarity index 97%
rename from tests/seteps/seteps-old.f90
rename to tests/seteps/setepsdriver-f90-seteps.f90
index 6ae2fc11c9762187db5b512e97d3b6f70b772de4..30d0ea1ca0438d8b5d9878c349efa2cf1472b3ad 100644
--- a/tests/seteps/seteps-old.f90
+++ b/tests/seteps/setepsdriver-f90-seteps.f90
@@ -77,7 +77,7 @@ subroutine seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode)
         if (osc(2, j) >= 0.0d0) then
           deno = 1.0d0 - deno
         endif
-        if (cdabs(deno) == 0.0d0) then ! replace 0 by machine epsilon
+        if (cdabs(deno) < epsilon(1.0d0) / 2) then ! replace 0 by machine epsilon
           ! if deno is always > 0 then this would do it: 
           ! deno = cdmax(deno, epsilon(1.0d0) / 2)
           deno = epsilon(1.0d0) / 2
diff --git a/tests/seteps/seteps-original.for b/tests/seteps/setepsdriver-original-seteps.for
similarity index 100%
rename from tests/seteps/seteps-original.for
rename to tests/seteps/setepsdriver-original-seteps.for
diff --git a/tests/seteps/setepsdriver-original.f90 b/tests/seteps/setepsdriver-original.f90
index 32f7ca163260102effb94aafc4a708d996146696..845073bfd471153a4efcb23fe5d7d00a985745f9 100644
--- a/tests/seteps/setepsdriver-original.f90
+++ b/tests/seteps/setepsdriver-original.f90
@@ -21,7 +21,7 @@ program setepsdriver
 
   write(*,*) 'setepsdriver-original start'
   
-  epsmac = epsilon(1.0d0)
+  epsmac = epsilon(1.0d0) / 2
 
   open(unit = 11, file = 'build-original/eelsin')
   read(11, *)