diff --git a/test/expected/telemetry_community.out b/test/expected/telemetry_community.out
index c7e9aede1..ab517e74d 100644
--- a/test/expected/telemetry_community.out
+++ b/test/expected/telemetry_community.out
@@ -100,3 +100,61 @@ SELECT json_object_field(get_telemetry_report(always_display_report := true)::js
  "0"
 (1 row)
 
+--test compression
+ALTER TABLE device_readings SET(timescaledb.compress);
+insert into device_readings select  generate_series('2018-01-01 00:00'::timestamp, '2018-01-02 00:00'::timestamp, '1 hour');
+select  count(compress_chunk(ch1.schema_name|| '.' || ch1.table_name))
+FROM _timescaledb_catalog.chunk ch1, _timescaledb_catalog.hypertable ht where ch1.hypertable_id = ht.id and ht.table_name like 'device_readings';
+ count 
+-------
+     1
+(1 row)
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_hypertables');
+ json_object_field 
+-------------------
+ "1"
+(1 row)
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_compressed_hypertables');
+ json_object_field 
+-------------------
+ "1"
+(1 row)
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_heap_size');
+ json_object_field 
+-------------------
+ "8192"
+(1 row)
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_index_size');
+ json_object_field 
+-------------------
+ "0"
+(1 row)
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_toast_size');
+ json_object_field 
+-------------------
+ "8192"
+(1 row)
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_heap_size');
+ json_object_field 
+-------------------
+ "8192"
+(1 row)
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_index_size');
+ json_object_field 
+-------------------
+ "16384"
+(1 row)
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_toast_size');
+ json_object_field 
+-------------------
+ "0"
+(1 row)
+
diff --git a/test/expected/telemetry_compression.out b/test/expected/telemetry_compression.out
deleted file mode 100644
index 1e9987f03..000000000
--- a/test/expected/telemetry_compression.out
+++ /dev/null
@@ -1,120 +0,0 @@
--- This file and its contents are licensed under the Apache License 2.0.
--- Please see the included NOTICE for copyright information and
--- LICENSE-APACHE for a copy of the license.
---telemetry tests that involve compression (not to be run for PG 9.6)
---create a continuous agg
-CREATE TABLE device_readings (
-      observation_time  TIMESTAMPTZ       NOT NULL
-);
-SELECT table_name FROM create_hypertable('device_readings', 'observation_time');
-   table_name    
------------------
- device_readings
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_hypertables');
- json_object_field 
--------------------
- "1"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_compressed_hypertables');
- json_object_field 
--------------------
- "0"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_heap_size');
- json_object_field 
--------------------
- "0"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_index_size');
- json_object_field 
--------------------
- "0"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_toast_size');
- json_object_field 
--------------------
- "0"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_heap_size');
- json_object_field 
--------------------
- "0"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_index_size');
- json_object_field 
--------------------
- "0"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_toast_size');
- json_object_field 
--------------------
- "0"
-(1 row)
-
---test compression
-ALTER TABLE device_readings SET(timescaledb.compress);
-insert into device_readings select  generate_series('2018-01-01 00:00'::timestamp, '2018-01-02 00:00'::timestamp, '1 hour');
-select  count(compress_chunk(ch1.schema_name|| '.' || ch1.table_name))
-FROM _timescaledb_catalog.chunk ch1, _timescaledb_catalog.hypertable ht where ch1.hypertable_id = ht.id and ht.table_name like 'device_readings';
- count 
--------
-     1
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_hypertables');
- json_object_field 
--------------------
- "1"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_compressed_hypertables');
- json_object_field 
--------------------
- "1"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_heap_size');
- json_object_field 
--------------------
- "8192"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_index_size');
- json_object_field 
--------------------
- "0"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_toast_size');
- json_object_field 
--------------------
- "8192"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_heap_size');
- json_object_field 
--------------------
- "8192"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_index_size');
- json_object_field 
--------------------
- "16384"
-(1 row)
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_toast_size');
- json_object_field 
--------------------
- "0"
-(1 row)
-
diff --git a/test/sql/CMakeLists.txt b/test/sql/CMakeLists.txt
index ac83fad20..bd13195aa 100644
--- a/test/sql/CMakeLists.txt
+++ b/test/sql/CMakeLists.txt
@@ -60,7 +60,6 @@ if(NOT APACHE_ONLY)
     chunk_utils_compression.sql
     edition.sql
     telemetry_community.sql
-    telemetry_compression.sql
   )
 endif()
 
diff --git a/test/sql/telemetry_community.sql b/test/sql/telemetry_community.sql
index da01db46b..b6dab91cd 100644
--- a/test/sql/telemetry_community.sql
+++ b/test/sql/telemetry_community.sql
@@ -13,7 +13,6 @@ SELECT json_object_field(get_telemetry_report(always_display_report := true)::js
 -- check timescaledb_telemetry.cloud
 SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'instance_metadata');
 
-
 --create a continuous agg
 CREATE TABLE device_readings (
       observation_time  TIMESTAMPTZ       NOT NULL
@@ -37,3 +36,19 @@ SELECT json_object_field(get_telemetry_report(always_display_report := true)::js
 SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_heap_size');
 SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_index_size');
 SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_toast_size');
+
+--test compression
+ALTER TABLE device_readings SET(timescaledb.compress);
+insert into device_readings select  generate_series('2018-01-01 00:00'::timestamp, '2018-01-02 00:00'::timestamp, '1 hour');
+select  count(compress_chunk(ch1.schema_name|| '.' || ch1.table_name))
+FROM _timescaledb_catalog.chunk ch1, _timescaledb_catalog.hypertable ht where ch1.hypertable_id = ht.id and ht.table_name like 'device_readings';
+
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_hypertables');
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_compressed_hypertables');
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_heap_size');
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_index_size');
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_toast_size');
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_heap_size');
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_index_size');
+SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_toast_size');
+
diff --git a/test/sql/telemetry_compression.sql b/test/sql/telemetry_compression.sql
deleted file mode 100644
index 879a50a67..000000000
--- a/test/sql/telemetry_compression.sql
+++ /dev/null
@@ -1,35 +0,0 @@
--- This file and its contents are licensed under the Apache License 2.0.
--- Please see the included NOTICE for copyright information and
--- LICENSE-APACHE for a copy of the license.
-
---telemetry tests that involve compression (not to be run for PG 9.6)
---create a continuous agg
-
-CREATE TABLE device_readings (
-      observation_time  TIMESTAMPTZ       NOT NULL
-);
-SELECT table_name FROM create_hypertable('device_readings', 'observation_time');
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_hypertables');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_compressed_hypertables');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_heap_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_index_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_toast_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_heap_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_index_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_toast_size');
-
---test compression
-ALTER TABLE device_readings SET(timescaledb.compress);
-insert into device_readings select  generate_series('2018-01-01 00:00'::timestamp, '2018-01-02 00:00'::timestamp, '1 hour');
-select  count(compress_chunk(ch1.schema_name|| '.' || ch1.table_name))
-FROM _timescaledb_catalog.chunk ch1, _timescaledb_catalog.hypertable ht where ch1.hypertable_id = ht.id and ht.table_name like 'device_readings';
-
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_hypertables');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'num_compressed_hypertables');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_heap_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_index_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'compressed_toast_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_heap_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_index_size');
-SELECT json_object_field(get_telemetry_report(always_display_report := true)::json,'uncompressed_toast_size');