.

component/ZODB/test-common.cfg

@@ -3,12 +3,12 @@
 
 [buildout]
 extends =
-# test<X>.cfg configures ZODB.major to be <X>.
+# test<X>.cfg configures ZODB.major=<X>.
 
-    buildout-dev.cfg
+    ../../stack/nxdtest.cfg
     ../pygolang/buildout.cfg
     ../python-manuel/buildout.cfg
-    ../../stack/nxdtest.cfg
+    buildout-dev.cfg
 
 parts =
     ZODB

component/zodbtools/test-common.cfg

@@ -3,8 +3,7 @@
 
 [buildout]
 extends =
-# test*.cfg first extend from neoppod/software<ZODB-flavour>.cfg to use
-# appropriate ZODB and versions of other components.
+# test<X>.cfg configures ZODB.major=<X>.
 
     ../../stack/nxdtest.cfg
     ../pytest/buildout.cfg

component/zodbtools/test-zodb5.cfg

@@ -4,3 +4,6 @@
 extends =
     ../../software/neoppod/software-zodb5.cfg
     test-common.cfg
+
+[ZODB]
+major = 5

component/zodbtools/test.cfg

 # SlapOS software release to test zodbtools on Nexedi testing infrastructure.
 
 [buildout]
-extends =
-    ../../software/neoppod/software.cfg
-    test-common.cfg
+extends = test-common.cfg