diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77173a28..e07f1bbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 7.11.0 (unreleased)
 ### New features
 - [PR #1114](https://github.com/rqlite/rqlite/pull/1114): Support automatically removing non-reachable nodes after a configurable period. Fixes [issue #728](https://github.com/rqlite/rqlite/issues/728).
+- [PR #1116](https://github.com/rqlite/rqlite/pull/1116): Support associative form for query responses. Fixes [issue #1115](https://github.com/rqlite/rqlite/issues/1115).
 
 ## 7.10.1 (November 11th 2022)
 
diff --git a/cluster/service_database_test.go b/cluster/service_database_test.go
index 0d1967a1..1645352e 100644
--- a/cluster/service_database_test.go
+++ b/cluster/service_database_test.go
@@ -422,7 +422,8 @@ func loadRequest(b []byte) *command.LoadRequest {
 }
 
 func asJSON(v interface{}) string {
-	b, err := encoding.JSONMarshal(v)
+	enc := encoding.Encoder{}
+	b, err := enc.JSONMarshal(v)
 	if err != nil {
 		panic(fmt.Sprintf("failed to JSON marshal value: %s", err.Error()))
 	}
diff --git a/db/db_test.go b/db/db_test.go
index a513a6b9..773c7f27 100644
--- a/db/db_test.go
+++ b/db/db_test.go
@@ -1890,7 +1890,8 @@ func mustQuery(db *DB, stmt string) {
 }
 
 func asJSON(v interface{}) string {
-	b, err := encoding.JSONMarshal(v)
+	enc := encoding.Encoder{}
+	b, err := enc.JSONMarshal(v)
 	if err != nil {
 		panic(fmt.Sprintf("failed to JSON marshal value: %s", err.Error()))
 	}
diff --git a/store/store_test.go b/store/store_test.go
index 40e78f1f..227fed28 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -2182,7 +2182,8 @@ func waitForLeaderID(s *Store, timeout time.Duration) (string, error) {
 }
 
 func asJSON(v interface{}) string {
-	b, err := encoding.JSONMarshal(v)
+	enc := encoding.Encoder{}
+	b, err := enc.JSONMarshal(v)
 	if err != nil {
 		panic(fmt.Sprintf("failed to JSON marshal value: %s", err.Error()))
 	}
diff --git a/system_test/helpers.go b/system_test/helpers.go
index 68e82524..abdcdb0f 100644
--- a/system_test/helpers.go
+++ b/system_test/helpers.go
@@ -734,7 +734,8 @@ func mustParseDuration(d string) time.Duration {
 }
 
 func asJSON(v interface{}) string {
-	b, err := encoding.JSONMarshal(v)
+	enc := encoding.Encoder{}
+	b, err := enc.JSONMarshal(v)
 	if err != nil {
 		panic(fmt.Sprintf("failed to JSON marshal value: %s", err.Error()))
 	}