diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java
index f2c8188..3676aa7 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java
@@ -1215,7 +1215,7 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest {
 
             .andDo(MockMvcResultHandlers.print())
             .andExpect(MockMvcResultMatchers.status().isOk())
-            .andExpect(MockMvcResultMatchers.header().string("Content-Disposition", "attachment; filename=data.gz"));
+            .andExpect(MockMvcResultMatchers.header().string("Content-Disposition", "attachment; filename=data.csv"));
    }
 
    @Test
diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java
index 3b4b07a..d468f3d 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java
@@ -1790,7 +1790,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements
 
             .andDo(MockMvcResultHandlers.print())
             .andExpect(MockMvcResultMatchers.status().isOk())
-            .andExpect(MockMvcResultMatchers.header().string("Content-Disposition", "attachment; filename=data.gz"));
+            .andExpect(MockMvcResultMatchers.header().string("Content-Disposition", "attachment; filename=data.json"));
    }
 
    @Test
diff --git a/src/test/java/ch/psi/daq/test/queryrest/response/ResponseQueryTest.java b/src/test/java/ch/psi/daq/test/queryrest/response/ResponseQueryTest.java
index 3771c59..02c0ef1 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/response/ResponseQueryTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/response/ResponseQueryTest.java
@@ -68,7 +68,7 @@ public class ResponseQueryTest extends AbstractDaqRestTest {
       assertEquals(query.getResponse().getFormat(), deserial.getResponse().getFormat());
       assertEquals(query.getResponse().getCompression(), deserial.getResponse().getCompression());
 
-      assertEquals(query.getResponse().getCompression().getFileSuffix(), deserial.getResponse().getFileSuffix());
+      assertEquals(query.getResponse().getFileSuffix(), deserial.getResponse().getFileSuffix());
    }
 
    @Test