diff --git a/src/test/java/com/arangodb/ArangoDatabaseTest.java b/src/test/java/com/arangodb/ArangoDatabaseTest.java
index 501dd67b1..911f3b1d9 100644
--- a/src/test/java/com/arangodb/ArangoDatabaseTest.java
+++ b/src/test/java/com/arangodb/ArangoDatabaseTest.java
@@ -509,14 +509,14 @@ public void getCollections() {
         public void getCollectionsExcludeSystem() {
                 try {
                         final CollectionsReadOptions options = new CollectionsReadOptions().excludeSystem(true);
-                        final Collection<CollectionEntity> systemCollections = db.getCollections(options);
+                        final Collection<CollectionEntity> nonSystemCollections = db.getCollections(options);
                         
-                        assertThat(systemCollections.size(), is(0));
+                        assertThat(nonSystemCollections.size(), is(0));
                         db.createCollection(COLLECTION_NAME + "1", null);
                         db.createCollection(COLLECTION_NAME + "2", null);
-                        final Collection<CollectionEntity> collections = db.getCollections(options);
-                        assertThat(collections.size(), is(2));
-                        assertThat(collections, is(notNullValue()));
+                        final Collection<CollectionEntity> newCollections = db.getCollections(options);
+                        assertThat(newCollections.size(), is(2));
+                        assertThat(newCollections, is(notNullValue()));
                 } catch (final ArangoDBException e) {
                   System.out.println(e.getErrorMessage());
                 } finally {
diff --git a/src/test/java/com/arangodb/ArangoGraphTest.java b/src/test/java/com/arangodb/ArangoGraphTest.java
index 550c2872d..6b5c0a5d4 100644
--- a/src/test/java/com/arangodb/ArangoGraphTest.java
+++ b/src/test/java/com/arangodb/ArangoGraphTest.java
@@ -33,6 +33,7 @@
 import java.util.Iterator;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -288,4 +289,8 @@ public void dropPlusDropCollections() {
 		assertThat(db.collection(vertexCollection).exists(), is(false));
 	}
 
+	@AfterClass
+	public static void shutdown() {
+		db.drop();
+	}
 }