diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java
index dcfead3..caa7e3b 100644
--- a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java
+++ b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java
@@ -5,6 +5,7 @@ package org.gcube.accounting.analytics.persistence;
 
 import org.gcube.accounting.analytics.persistence.couchbase.AccountingPersistenceQueryCouchBase;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -19,8 +20,13 @@ public class AccountingPersistenceQueryConfigurationTest {
 	private static Logger logger = LoggerFactory.getLogger(AccountingPersistenceQueryConfigurationTest.class);
 	
 	@Before
-	public void before() throws Exception{
-		SecurityTokenProvider.instance.set("");
+	public void before(){
+		SecurityTokenProvider.instance.set(TestUtility.TOKEN);
+	}
+	
+	@After
+	public void after(){
+		SecurityTokenProvider.instance.reset();
 	}
 	
 	@Test
diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java
index 1c07586..4d45f85 100644
--- a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java
+++ b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java
@@ -41,7 +41,7 @@ public class AccountingPersistenceQueryFactoryTest {
 	
 	@Before
 	public void before() throws Exception{
-		SecurityTokenProvider.instance.set("");
+		SecurityTokenProvider.instance.set(TestUtility.TOKEN);
 		apq = AccountingPersistenceBackendQueryFactory.getInstance();
 	}
 	
diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/TestUtility.java b/src/test/java/org/gcube/accounting/analytics/persistence/TestUtility.java
new file mode 100644
index 0000000..e6dd9e1
--- /dev/null
+++ b/src/test/java/org/gcube/accounting/analytics/persistence/TestUtility.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.gcube.accounting.analytics.persistence;
+
+/**
+ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ *
+ */
+public class TestUtility {
+
+	public static final String TOKEN = "";
+	
+}