diff --git a/core-document-store/src/main/java/org/gluu/service/document/store/provider/DBDocumentStoreProvider.java b/core-document-store/src/main/java/org/gluu/service/document/store/provider/DBDocumentStoreProvider.java
index 287ce5c1..b81fa456 100644
--- a/core-document-store/src/main/java/org/gluu/service/document/store/provider/DBDocumentStoreProvider.java
+++ b/core-document-store/src/main/java/org/gluu/service/document/store/provider/DBDocumentStoreProvider.java
@@ -92,7 +92,7 @@ public boolean saveDocument(String name, String documentContent, Charset charset
 				oxDocument.setInum(documentService.generateInumForNewOxDocument());	
 				String dn = "inum="+ oxDocument.getInum() +",ou=document,o=gluu";
 				oxDocument.setDn(dn);
-				oxDocument.setDescription("Testing the document saving");
+				oxDocument.setDescription(name);
 				oxDocument.setOxEnabled("true");
 				oxDocument.setOxModuleProperty("oxtrusr server");
 				documentService.addOxDocument(oxDocument);
@@ -121,8 +121,7 @@ public boolean saveDocumentStream(String name, InputStream documentStream) {
 			oxDocument.setInum(inum);	
 			String dn = "inum="+ oxDocument.getInum() +",ou=document,o=gluu";
 			oxDocument.setDn(dn);
-			oxDocument.setDisplayName("Test");
-			oxDocument.setDescription("Testing the document saving");
+			oxDocument.setDescription(name);
 			oxDocument.setOxEnabled("true");
 			oxDocument.setOxModuleProperty("oxtrusr server");
 			documentService.addOxDocument(oxDocument);