diff --git a/.gitignore b/.gitignore
index beef64f91ab960f989bf395a16430c6fbc54a3cd..c3c06b6a97cfe6ea28c9eaa77ad08a4ab3755b3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ tests/oxlog/bosonf90
 tests/oxlog/bosou
 tests/oxlog/eelsou
 tests/setepslog/eelsf90
-tests/seteps/build
+tests/seteps/build-f90
diff --git a/tests/seteps/Makefile b/tests/seteps/Makefile
index bfce71578649ce10b8bf3a1a4988a844e432d25f..69b3028a258a4c8911f5a115bf0979a08872c753 100644
--- a/tests/seteps/Makefile
+++ b/tests/seteps/Makefile
@@ -13,27 +13,27 @@ ifeq "$(GFORTAN_VERSION_GE_5)" "1"
 endif
 
 # implicit rules for compiling fortran files
-build/%.o:       ../../source/f90/%.f90
-	$(FC) $(FFLAGS) -c -Jbuild -o $@ $<
-build/%_mod.mod: ../../source/f90/%.f90
-	$(FC) $(FFLAGS) -c -Jbuild -o build/seteps.o  $<
+build-f90/%.o:       ../../source/f90/%.f90
+	$(FC) $(FFLAGS) -c -Jbuild-f90 -o $@ $<
+build-f90/%_mod.mod: ../../source/f90/%.f90
+	$(FC) $(FFLAGS) -c -Jbuild-f90 -o build-f90/seteps.o  $<
 
-all: build/setepsdriver
+all: build-f90/setepsdriver
 
-build/setepsdriver: setepsdriver.f90 build/seteps.o build/seteps_mod.mod
-	$(FC) $(FFLAGS) -Jbuild -o $@ $< build/seteps.o
+build-f90/setepsdriver: setepsdriver-f90.f90 build-f90/seteps.o build-f90/seteps_mod.mod
+	$(FC) $(FFLAGS) -Jbuild-f90 -o $@ $< build-f90/seteps.o
 
-test: build/setepsdriver
+test: build-f90/setepsdriver
 	for NUMBER in 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018 019 020 021 022 023 024 025 ; do \
-		cp ../../tests/inputFiles/eelsin$$NUMBER build/eelsin ; \
+		cp ../../tests/inputFiles/eelsin$$NUMBER build-f90/eelsin ; \
 		echo " eels input file number: "$$NUMBER ; \
-		build/setepsdriver ; \
-		mv build/epsout results/epsout$$NUMBER ; \
-		rm build/eelsin ; \
+		build-f90/setepsdriver ; \
+		mv build-f90/epsout results/epsout$$NUMBER ; \
+		rm build-f90/eelsin ; \
 	done
 
 clean:
-	rm -rf build/*
+	rm -rf build-f90/*
 	rm -rf results/*
 
 .PHONY: all clean test
diff --git a/tests/seteps/setepsdriver.f90 b/tests/seteps/setepsdriver-f90.f90
similarity index 95%
rename from tests/seteps/setepsdriver.f90
rename to tests/seteps/setepsdriver-f90.f90
index ef4b9e8d14b46fd2ce6c662fc4fbf42ee9be5d13..d84c788a5396fa0726dfcbc4824d1778efc0cce1 100644
--- a/tests/seteps/setepsdriver.f90
+++ b/tests/seteps/setepsdriver-f90.f90
@@ -24,7 +24,7 @@ program setepsdriver
   tab = char(9)
   noPoints = 200
   
-  open(unit = 11, file = 'build/eelsin')
+  open(unit = 11, file = 'build-f90/eelsin')
   read(11, *) line
   read(11, *) line
   read(11, *) line
@@ -75,7 +75,7 @@ program setepsdriver
   wn = wmin
   allocate (eps(neps))
 
-  open(unit = 12, file = 'build/epsout')
+  open(unit = 12, file = 'build-f90/epsout')
   do i = 0, noPoints
       call seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode)
       write (12, '(30g15.7)') wn,  (eps(j), j = 1, neps)