diff -r 66f94d7f9ca7 -r c9d12d1d3081 devtools/__init__.py
--- a/devtools/__init__.py	Wed Dec 02 15:24:03 2015 +0100
+++ b/devtools/__init__.py	Thu Dec 17 15:17:45 2015 +0100
@@ -540,7 +540,7 @@
 
 def startpgcluster(pyfile):
     """Start a postgresql cluster next to pyfile"""
-    datadir = join(os.path.dirname(pyfile), 'data',
+    datadir = join(os.path.dirname(pyfile), 'data', 'database',
                    'pgdb-%s' % os.path.splitext(os.path.basename(pyfile))[0])
     if not exists(datadir):
         try:
@@ -579,7 +579,7 @@
 
 def stoppgcluster(pyfile):
     """Kill the postgresql cluster running next to pyfile"""
-    datadir = join(os.path.dirname(pyfile), 'data',
+    datadir = join(os.path.dirname(pyfile), 'data', 'database',
                    'pgdb-%s' % os.path.splitext(os.path.basename(pyfile))[0])
     subprocess.call(['pg_ctl', 'stop', '-D', datadir, '-m', 'fast'])
     try: