diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ScopedTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java
similarity index 90%
rename from src/test/java/org/gcube/informationsystem/resourceregistry/client/ScopedTest.java
rename to src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java
index 7a99b5a..cb3580f 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ScopedTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java
@@ -21,9 +21,9 @@ import org.slf4j.LoggerFactory;
  * @author Luca Frosini (ISTI - CNR)
  *
  */
-public class ScopedTest {
+public class ContextTest {
 	
-	private static final Logger logger = LoggerFactory.getLogger(ScopedTest.class);
+	private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
 	
 	protected static final String PROPERTIES_FILENAME = "token.properties"; 
 	
@@ -53,7 +53,7 @@ public class ScopedTest {
 	
 	static {
 		Properties properties = new Properties();
-		InputStream input = ScopedTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
+		InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
 
 		try {
 			// load the properties file
@@ -70,12 +70,12 @@ public class ScopedTest {
 		
 		GCUBE = properties.getProperty(GCUBE_VARNAME);
 		
-		DEFAULT_TEST_SCOPE = GCUBE_DEVNEXT_NEXTNEXT;
+		DEFAULT_TEST_SCOPE = GCUBE_DEVSEC;
 		ALTERNATIVE_TEST_SCOPE = GCUBE_DEVSEC_DEVVRE;
 		
 		
 		properties = new Properties();
-		input = ScopedTest.class.getClassLoader().getResourceAsStream(REGISTRY_PROPERTIES_FILENAME);
+		input = ContextTest.class.getClassLoader().getResourceAsStream(REGISTRY_PROPERTIES_FILENAME);
 		try {
 			// load the properties file
 			properties.load(input);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java
index abb9ae9..ddda662 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-public class ResourceRegistryClientTest extends ScopedTest {
+public class ResourceRegistryClientTest extends ContextTest {
 	
 	private static Logger logger = LoggerFactory.getLogger(ResourceRegistryClientTest.class);