diff --git a/Changes b/Changes
index 27b711d..daf08f3 100644
--- a/Changes
+++ b/Changes
@@ -7,6 +7,8 @@
 - Remove admin test data from database migration (close #808)
 - Remove user default settings from the database migration (close #810)
 - Fix KoralQuery and remove required access from query reference.
+- Remove query reference test data from the database migration (close #811)
+
 
 # version 0.78.2
 
diff --git a/src/main/java/de/ids_mannheim/korap/init/Initializator.java b/src/main/java/de/ids_mannheim/korap/init/Initializator.java
index 0304fa1..02a141d 100644
--- a/src/main/java/de/ids_mannheim/korap/init/Initializator.java
+++ b/src/main/java/de/ids_mannheim/korap/init/Initializator.java
@@ -10,13 +10,16 @@
 import de.ids_mannheim.korap.config.FullConfiguration;
 import de.ids_mannheim.korap.config.KustvaktConfiguration;
 import de.ids_mannheim.korap.constant.OAuth2Scope;
+import de.ids_mannheim.korap.constant.QueryType;
+import de.ids_mannheim.korap.constant.ResourceType;
 import de.ids_mannheim.korap.dao.AdminDao;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.oauth2.dao.AccessScopeDao;
 import de.ids_mannheim.korap.oauth2.service.OAuth2InitClientService;
+import de.ids_mannheim.korap.service.QueryService;
 import de.ids_mannheim.korap.user.KorAPUser;
-import de.ids_mannheim.korap.user.User;
 import de.ids_mannheim.korap.util.QueryException;
+import de.ids_mannheim.korap.web.input.QueryJson;
 
 /**
  * Initializes values in the database from kustvakt configuration and
@@ -39,6 +42,8 @@
     private FullConfiguration config;
     @Autowired
     private OAuth2InitClientService clientService;
+    @Autowired
+    private QueryService queryService;
 
     public Initializator () {}
 
@@ -67,6 +72,14 @@
 		}
 		vcLoader.loadVCToCache("system-vc", "/vc/system-vc.jsonld");
 		adminDao.addAccount(new KorAPUser("admin"));
+		
+		QueryJson q = new QueryJson();
+		q.setType(ResourceType.SYSTEM);
+		q.setQueryLanguage("poliqarp");
+		q.setQuery("[]");
+		q.setDescription("\"system\" query");
+		q.setQueryType(QueryType.QUERY);
+		queryService.handlePutRequest("system", "system", "system-q", q);
 	}
 
     public void initResourceTest () throws IOException, KustvaktException {
diff --git a/src/main/resources/db/test/V3.7__insert_query_references.sql b/src/main/resources/db/test/V3.7__insert_query_references.sql
index 0507380..a4bcda9 100644
--- a/src/main/resources/db/test/V3.7__insert_query_references.sql
+++ b/src/main/resources/db/test/V3.7__insert_query_references.sql
@@ -1,10 +1,10 @@
 -- query references
-INSERT INTO query(name, type, query_type, required_access, created_by, description, status, 
-    koral_query, query, query_language) 
-	VALUES ("dory-q", "PRIVATE", "QUERY", "FREE", "dory", "test query", "experimental",
-	'{ "@type": "koral:token" }', "[]", "poliqarp");
+-- INSERT INTO query(name, type, query_type, required_access, created_by, description, status, 
+--    koral_query, query, query_language) 
+--	VALUES ("dory-q", "PRIVATE", "QUERY", "FREE", "dory", "test query", "experimental",
+--	'{ "@type": "koral:token" }', "[]", "poliqarp");
 
-INSERT INTO query(name, type, query_type, required_access, created_by, description, status, 
-    koral_query, query, query_language) 
-	VALUES ("system-q", "SYSTEM", "QUERY", "FREE", "system", '"system" query', "experimental",
-	'{ "@type": "koral:token" }', "[]", "poliqarp");
+-- INSERT INTO query(name, type, query_type, required_access, created_by, description, status, 
+--    koral_query, query, query_language) 
+--	VALUES ("system-q", "SYSTEM", "QUERY", "FREE", "system", '"system" query', "experimental",
+--	'{ "@type": "koral:token" }', "[]", "poliqarp");