diff --git a/contrib/pg_wait_sampling/Makefile b/contrib/pg_wait_sampling/Makefile
index ab90e59aefb..1811ca3efae 100644
--- a/contrib/pg_wait_sampling/Makefile
+++ b/contrib/pg_wait_sampling/Makefile
@@ -13,6 +13,9 @@ REGRESS = load queries
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 EXTRA_CLEAN = pg_wait_sampling--$(EXTVERSION).sql
 
+REGRESS = --schedule=schedule
+EXTRA_INSTALL = contrib/aqo
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/contrib/pg_wait_sampling/conf.add b/contrib/pg_wait_sampling/conf.add
index 54c013d9353..07a53af96b6 100644
--- a/contrib/pg_wait_sampling/conf.add
+++ b/contrib/pg_wait_sampling/conf.add
@@ -1 +1 @@
-shared_preload_libraries = 'pg_wait_sampling'
+shared_preload_libraries = 'aqo, pg_wait_sampling'
diff --git a/contrib/pg_wait_sampling/schedule b/contrib/pg_wait_sampling/schedule
new file mode 100644
index 00000000000..68a82dc7417
--- /dev/null
+++ b/contrib/pg_wait_sampling/schedule
@@ -0,0 +1,10 @@
+test: queries queries
+test: queries queries
+test: queries queries
+test: queries queries
+test: queries queries
+test: queries queries
+test: queries queries
+test: queries queries
+test: queries queries
+test: queries queries