diff --git a/META-INF/RASCAL.MF b/META-INF/RASCAL.MF
index c9c09d0b53b..88b97a17f04 100644
--- a/META-INF/RASCAL.MF
+++ b/META-INF/RASCAL.MF
@@ -1,5 +1,5 @@
 Project-Name: rascal
-Source: src/org/rascalmpl/library
+Source: src/org/rascalmpl/library,test/org/rascalmpl/benchmark
 Courses: src/org/rascalmpl/courses
 
 
diff --git a/src/org/rascalmpl/interpreter/load/StandardLibraryContributor.java b/src/org/rascalmpl/interpreter/load/StandardLibraryContributor.java
index a312d533f55..f9ce268d958 100644
--- a/src/org/rascalmpl/interpreter/load/StandardLibraryContributor.java
+++ b/src/org/rascalmpl/interpreter/load/StandardLibraryContributor.java
@@ -66,8 +66,7 @@ public void contributePaths(List<ISourceLocation> l) {
 		try {
 			l.add(vf.sourceLocation("std","",""));
 			l.add(vf.sourceLocation("testdata","",""));
-                        l.add(vf.sourceLocation("test-modules","",""));
-			l.add(vf.sourceLocation("benchmarks","",""));
+			l.add(vf.sourceLocation("test-modules","",""));
 		}
 		catch (URISyntaxException e) {
 			assert false;
@@ -76,7 +75,7 @@ public void contributePaths(List<ISourceLocation> l) {
 
 	@Override
 	public String toString() {
-		return "[std://, testdata://, test-modules://, benchmarks://]";
+		return "[std://, testdata://, test-modules://]";
 	}
 	
 	@Override
diff --git a/src/org/rascalmpl/test/infrastructure/TestFramework.java b/src/org/rascalmpl/test/infrastructure/TestFramework.java
index 92effe9b872..9619815ab04 100644
--- a/src/org/rascalmpl/test/infrastructure/TestFramework.java
+++ b/src/org/rascalmpl/test/infrastructure/TestFramework.java
@@ -63,7 +63,9 @@ public class TestFramework {
 		evaluator.addRascalSearchPathContributor(StandardLibraryContributor.getInstance());
 		
 		evaluator.addRascalSearchPath(URIUtil.rootLocation("test-modules"));
-		evaluator.addRascalSearchPath(URIUtil.rootLocation("benchmarks"));
+
+		RascalJUnitTestRunner.configureProjectEvaluator(evaluator, RascalJUnitTestRunner.inferProjectRoot(TestFramework.class));
+		
 		try {
 			assert (false);
 			throw new RuntimeException("Make sure you enable the assert statement in your run configuration ( add -ea )");
diff --git a/src/org/rascalmpl/uri/libraries/BenchmarkURIResolver.java b/src/org/rascalmpl/uri/libraries/BenchmarkURIResolver.java
deleted file mode 100644
index f17a6ec9616..00000000000
--- a/src/org/rascalmpl/uri/libraries/BenchmarkURIResolver.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.rascalmpl.uri.libraries;
-
-public class BenchmarkURIResolver extends ClassResourceInput {
-
-    public BenchmarkURIResolver() {
-        super("benchmarks", BenchmarkURIResolver.class, "/org/rascalmpl/benchmark");
-    }
-
-}
diff --git a/src/org/rascalmpl/uri/resolvers.config b/src/org/rascalmpl/uri/resolvers.config
index e6729f77e6b..c06967a2033 100644
--- a/src/org/rascalmpl/uri/resolvers.config
+++ b/src/org/rascalmpl/uri/resolvers.config
@@ -15,6 +15,5 @@ org.rascalmpl.uri.file.CWDURIResolver
 org.rascalmpl.uri.file.SystemPathURIResolver
 org.rascalmpl.uri.libraries.TestDataURIResolver
 org.rascalmpl.uri.libraries.MemoryResolver
-org.rascalmpl.uri.libraries.BenchmarkURIResolver
 org.rascalmpl.uri.libraries.RascalLibraryURIResolver
 org.rascalmpl.shell.ManifestURIResolver
diff --git a/test/org/rascalmpl/benchmark/RSF/RSFCalls.rsc b/test/org/rascalmpl/benchmark/RSF/RSFCalls.rsc
index 86e452fc440..7577d9959ca 100644
--- a/test/org/rascalmpl/benchmark/RSF/RSFCalls.rsc
+++ b/test/org/rascalmpl/benchmark/RSF/RSFCalls.rsc
@@ -13,7 +13,7 @@ module RSF::RSFCalls
 import Relation;
 import util::Math;
 import Set;
-import  analysis::graphs::Graph;
+import analysis::graphs::Graph;
 import lang::rsf::IO;
 import IO;
 import util::Benchmark;
@@ -29,11 +29,10 @@ public bool measureOne(){
 }
 
 public bool measure(list[str] names){
-
-	loc p = |benchmarks:///RSF/|;
+	loc p = {loc x} := findResources("RSF") ? x : |not-found:///|;
 	
 	for(str name <- names){
-		map[str, rel[str,str]] values = readRSF(p[path= p.path + name]);
+		map[str, rel[str,str]] values = readRSF(p + name);
 		rel[str,str] CALL = values["CALL"];
 		n = size(CALL);
 		println("<name>: CALL contains <n> tuples");
diff --git a/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java b/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java
index 60193807081..77082c8f4e0 100644
--- a/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java
+++ b/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java
@@ -36,7 +36,6 @@ private static Evaluator freshEvaluator() {
         var evaluator = new Evaluator(ValueFactoryFactory.getValueFactory(), System.in, System.err, System.out,  root, heap);
         evaluator.addRascalSearchPathContributor(StandardLibraryContributor.getInstance());
         evaluator.addRascalSearchPath(URIUtil.rootLocation("test-modules"));
-        evaluator.addRascalSearchPath(URIUtil.rootLocation("benchmarks"));
 
         evaluator.setTestResultListener(new ITestResultListener() {
             @Override