diff --git a/config.yml.example b/config.yml.example
index f96c32f..b188207 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -1,8 +1,8 @@
 development: &defaults
-  riak:
+  riak: &riak_defaults
     host: localhost
     http_port: 8098
-    buckets:
+    buckets: &bucket_defaults
       data: rs_data
       directories: rs_directories
       binaries: rs_binaries
@@ -10,8 +10,8 @@ development: &defaults
       opslog: rs_opslog
 
 test:
-  <<: *defaults
   riak:
+    <<: *riak_defaults
     buckets:
       data: rs_data_test
       directories: rs_directories_test