diff --git a/src/test/java/org/gcube/gcat/ContextTest.java b/src/test/java/org/gcube/gcat/ContextTest.java
index 78034ec..2dbb01c 100644
--- a/src/test/java/org/gcube/gcat/ContextTest.java
+++ b/src/test/java/org/gcube/gcat/ContextTest.java
@@ -28,76 +28,38 @@ public class ContextTest {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
 	
-	protected static final String PROPERTIES_FILENAME = "token.properties"; 
+	protected static Properties properties;
+	protected static final String PROPERTIES_FILENAME = "token.properties";
 	
-	private static final String GCUBE_VARNAME = "GCUBE";
-	public static final String GCUBE;
-	
-	private static final String GCUBE_DEVNEXT_VARNAME = "GCUBE_DEVNEXT";
-	public static final String GCUBE_DEVNEXT;
-	
-	private static final String GCUBE_DEVNEXT_NEXTNEXT_VARNAME = "GCUBE_DEVNEXT_NEXTNEXT";
-	public static final String GCUBE_DEVNEXT_NEXTNEXT;
-	
-	public static final String GCUBE_DEVSEC_VARNAME = "GCUBE_DEVSEC";
-	public static final String GCUBE_DEVSEC;
-	
-	public static final String GCUBE_DEVSEC_DEVVRE_VARNAME = "GCUBE_DEVSEC_DEVVRE";
-	public static final String GCUBE_DEVSEC_DEVVRE;
-	
-	
-	private static final String GCUBE_DEVNEXT_ANOTHER_USER_VARNAME = "GCUBE_DEVNEXT_ANOTHER_USER";
-	public static final String GCUBE_DEVNEXT_ANOTHER_USER;
-	
-	public static final String DEFAULT_TEST_SCOPE;
-	
-	public static final String GCUBE_PRE_PROD_PREVRE_VARNAME = "GCUBE_PRE_PROD_PREVRE";
-	public static final String GCUBE_PRE_PROD_PREVRE;
-	
-	public static final String GCUBE_PRE_PROD_PARTHENOS_REGISTRY_VARNAME = "GCUBE_PRE_PROD_PARTHENOS_REGISTRY";
-	public static final String GCUBE_PRE_PROD_PARTHENOS_REGISTRY;
-	
-	public static final String ROOT_VARNAME = "ROOT";
-	public static final String ROOT;
+	public static final String DEFAULT_TEST_SCOPE_NAME;
 	
 	static {
-		Properties properties = new Properties();
+		properties = new Properties();
 		InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
-
+		
 		try {
 			// load the properties file
 			properties.load(input);
-		} catch (IOException e) {
+		} catch(IOException e) {
 			throw new RuntimeException(e);
 		}
 		
-		GCUBE = properties.getProperty(GCUBE_VARNAME);
-		
-		GCUBE_DEVNEXT = properties.getProperty(GCUBE_DEVNEXT_VARNAME);
-		GCUBE_DEVNEXT_NEXTNEXT = properties.getProperty(GCUBE_DEVNEXT_NEXTNEXT_VARNAME);
-		
-		GCUBE_DEVSEC = properties.getProperty(GCUBE_DEVSEC_VARNAME);
-		GCUBE_DEVSEC_DEVVRE = properties.getProperty(GCUBE_DEVSEC_DEVVRE_VARNAME);
-		
-		GCUBE_DEVNEXT_ANOTHER_USER = properties.getProperty(GCUBE_DEVNEXT_ANOTHER_USER_VARNAME);
-		
-		GCUBE_PRE_PROD_PARTHENOS_REGISTRY = properties.getProperty(GCUBE_PRE_PROD_PARTHENOS_REGISTRY_VARNAME);
-		GCUBE_PRE_PROD_PREVRE = properties.getProperty(GCUBE_PRE_PROD_PREVRE_VARNAME);
-		ROOT = properties.getProperty(ROOT_VARNAME);
-		
-		DEFAULT_TEST_SCOPE = GCUBE_PRE_PROD_PREVRE;
-
+		DEFAULT_TEST_SCOPE_NAME = "/gcube/preprod/preVRE";
 	}
 	
-	public static String getCurrentScope(String token) throws ObjectNotFound, Exception{
+	public static String getCurrentScope(String token) throws ObjectNotFound, Exception {
 		AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
 		String context = authorizationEntry.getContext();
 		logger.info("Context of token {} is {}", token, context);
 		return context;
 	}
 	
+	public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception {
+		String token = ContextTest.properties.getProperty(fullContextName);
+		setContext(token);
+	}
 	
-	public static void setContext(String token) throws ObjectNotFound, Exception{
+	public static void setContext(String token) throws ObjectNotFound, Exception {
 		SecurityTokenProvider.instance.set(token);
 		AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
 		ClientInfo clientInfo = authorizationEntry.getClientInfo();
@@ -109,12 +71,12 @@ public class ContextTest {
 	}
 	
 	@BeforeClass
-	public static void beforeClass() throws Exception{
-		setContext(DEFAULT_TEST_SCOPE);
+	public static void beforeClass() throws Exception {
+		setContextByName(DEFAULT_TEST_SCOPE_NAME);
 	}
 	
 	@AfterClass
-	public static void afterClass() throws Exception{
+	public static void afterClass() throws Exception {
 		SecurityTokenProvider.instance.reset();
 		ScopeProvider.instance.reset();
 	}