diff --git a/test/README b/test/README
index 6b06500d6..7c82935ad 100644
--- a/test/README
+++ b/test/README
@@ -11,7 +11,7 @@
 
 You must configure both the generator and the runtime connection settings.
 {{{
-// in test/projects/bookstore/build.properties
+// in test/fixtures/bookstore/build.properties
 propel.database = mysql
 propel.database.url = mysql:dbname=test
 propel.mysqlTableType = InnoDB
@@ -22,7 +22,7 @@ propel.database.password = p@ssw0rd
 }}}
 
 {{{
-// in test/projects/bookstore/runtime-conf.xml
+// in test/fixtures/bookstore/runtime-conf.xml
 <datasource id="bookstore">
   <!-- the Propel adapter to use for this connection -->
   <adapter>mysql</adapter>
@@ -52,9 +52,9 @@ propel.database.password = p@ssw0rd
 
 {{{
 > cd /path/to/propel/test
-> ../generator/bin/propel-gen projects/bookstore
+> ../generator/bin/propel-gen fixtures/bookstore
 > mysqladmin create test
-> ../generator/bin/propel-gen projects/bookstore insert-sql
+> ../generator/bin/propel-gen fixtures/bookstore insert-sql
 }}}
 
 == Run the Unit Tests ==
diff --git a/test/projects/bookstore-packaged/author.schema.xml b/test/fixtures/bookstore-packaged/author.schema.xml
similarity index 100%
rename from test/projects/bookstore-packaged/author.schema.xml
rename to test/fixtures/bookstore-packaged/author.schema.xml
diff --git a/test/projects/bookstore-packaged/book.schema.xml b/test/fixtures/bookstore-packaged/book.schema.xml
similarity index 100%
rename from test/projects/bookstore-packaged/book.schema.xml
rename to test/fixtures/bookstore-packaged/book.schema.xml
diff --git a/test/projects/bookstore-packaged/book_club_list.schema.xml b/test/fixtures/bookstore-packaged/book_club_list.schema.xml
similarity index 100%
rename from test/projects/bookstore-packaged/book_club_list.schema.xml
rename to test/fixtures/bookstore-packaged/book_club_list.schema.xml
diff --git a/test/projects/bookstore-packaged/build.properties b/test/fixtures/bookstore-packaged/build.properties
similarity index 100%
rename from test/projects/bookstore-packaged/build.properties
rename to test/fixtures/bookstore-packaged/build.properties
diff --git a/test/projects/bookstore-packaged/log.schema.xml b/test/fixtures/bookstore-packaged/log.schema.xml
similarity index 100%
rename from test/projects/bookstore-packaged/log.schema.xml
rename to test/fixtures/bookstore-packaged/log.schema.xml
diff --git a/test/projects/bookstore-packaged/media.schema.xml b/test/fixtures/bookstore-packaged/media.schema.xml
similarity index 100%
rename from test/projects/bookstore-packaged/media.schema.xml
rename to test/fixtures/bookstore-packaged/media.schema.xml
diff --git a/test/projects/bookstore-packaged/publisher.schema.xml b/test/fixtures/bookstore-packaged/publisher.schema.xml
similarity index 100%
rename from test/projects/bookstore-packaged/publisher.schema.xml
rename to test/fixtures/bookstore-packaged/publisher.schema.xml
diff --git a/test/projects/bookstore-packaged/review.schema.xml b/test/fixtures/bookstore-packaged/review.schema.xml
similarity index 100%
rename from test/projects/bookstore-packaged/review.schema.xml
rename to test/fixtures/bookstore-packaged/review.schema.xml
diff --git a/test/projects/bookstore-packaged/runtime-conf.xml b/test/fixtures/bookstore-packaged/runtime-conf.xml
similarity index 100%
rename from test/projects/bookstore-packaged/runtime-conf.xml
rename to test/fixtures/bookstore-packaged/runtime-conf.xml
diff --git a/test/projects/bookstore/build.properties b/test/fixtures/bookstore/build.properties
similarity index 93%
rename from test/projects/bookstore/build.properties
rename to test/fixtures/bookstore/build.properties
index afa3c5c06..226debd07 100644
--- a/test/projects/bookstore/build.properties
+++ b/test/fixtures/bookstore/build.properties
@@ -17,8 +17,8 @@ propel.mysqlTableType = InnoDB
 propel.disableIdentifierQuoting=true
 
 # For MySQL or Oracle, you also need to specify username & password 
-#propel.database.user = [db username]
-#propel.database.password = [db password]
+propel.database.user = root
+propel.database.password = root
 
 # Note that if you do not wish to specify the database (e.g. if you
 # are using multiple databses) you can use the @DB@ token which
diff --git a/test/projects/bookstore/cms-schema.xml b/test/fixtures/bookstore/cms-schema.xml
similarity index 100%
rename from test/projects/bookstore/cms-schema.xml
rename to test/fixtures/bookstore/cms-schema.xml
diff --git a/test/projects/bookstore/runtime-conf.xml b/test/fixtures/bookstore/runtime-conf.xml
similarity index 90%
rename from test/projects/bookstore/runtime-conf.xml
rename to test/fixtures/bookstore/runtime-conf.xml
index 229090cab..95718c1ff 100644
--- a/test/projects/bookstore/runtime-conf.xml
+++ b/test/fixtures/bookstore/runtime-conf.xml
@@ -46,11 +46,8 @@
 				<connection>
 					<classname>DebugPDO</classname>
 					<dsn>mysql:dbname=test</dsn>
-					<!--
-					For MySQL and Oracle you must specify username + password separate from DSN:
-					<user>bookstore</user>
-					<password></password>
-					-->
+					<user>root</user>
+					<password>root</password>
 					<options>
 						<option id="ATTR_PERSISTENT">false</option>
 					</options>
@@ -81,11 +78,8 @@
 				<connection>
 					<classname>DebugPDO</classname>
 					<dsn>mysql:dbname=test</dsn>
-					<!--
-					For MySQL and Oracle you must specify username + password separate from DSN:
-					<user>bookstore</user>
-					<password></password>
-					-->
+					<user>root</user>
+					<password>root</password>
 					<options>
 						<option id="ATTR_PERSISTENT">false</option>
 					</options>
diff --git a/test/projects/bookstore/schema.xml b/test/fixtures/bookstore/schema.xml
similarity index 100%
rename from test/projects/bookstore/schema.xml
rename to test/fixtures/bookstore/schema.xml
diff --git a/test/projects/nestedset/build.properties b/test/fixtures/nestedset/build.properties
similarity index 100%
rename from test/projects/nestedset/build.properties
rename to test/fixtures/nestedset/build.properties
diff --git a/test/projects/nestedset/nestedset-schema.xml b/test/fixtures/nestedset/nestedset-schema.xml
similarity index 100%
rename from test/projects/nestedset/nestedset-schema.xml
rename to test/fixtures/nestedset/nestedset-schema.xml
diff --git a/test/projects/nestedset/runtime-conf.xml b/test/fixtures/nestedset/runtime-conf.xml
similarity index 100%
rename from test/projects/nestedset/runtime-conf.xml
rename to test/fixtures/nestedset/runtime-conf.xml
diff --git a/test/projects/treetest/build.properties b/test/fixtures/treetest/build.properties
similarity index 100%
rename from test/projects/treetest/build.properties
rename to test/fixtures/treetest/build.properties
diff --git a/test/projects/treetest/runtime-conf.xml b/test/fixtures/treetest/runtime-conf.xml
similarity index 100%
rename from test/projects/treetest/runtime-conf.xml
rename to test/fixtures/treetest/runtime-conf.xml
diff --git a/test/projects/treetest/treetest-schema.xml b/test/fixtures/treetest/treetest-schema.xml
similarity index 100%
rename from test/projects/treetest/treetest-schema.xml
rename to test/fixtures/treetest/treetest-schema.xml
diff --git a/test/test.xml b/test/test.xml
index a97ede0ff..0731461ec 100644
--- a/test/test.xml
+++ b/test/test.xml
@@ -32,11 +32,11 @@
 	<property name="test.class" value="${test}" />
 
 	<resolvepath propertyName="tests.dir.resolved" file="${tests.phpunit.dir}" />
-	<resolvepath propertyName="tests.classes.dir.resolved" file="${tests.phpunit.dir}/tests" />
+	<resolvepath propertyName="tests.classes.dir.resolved" file="${tests.phpunit.dir}/testsuite" />
 	<resolvepath propertyName="propel-generator.classes.dir.resolved" file="../generator/classes" />
 	<resolvepath propertyName="propel-runtime.classes.dir.resolved" file="../runtime/classes" />
-	<resolvepath propertyName="bookstore.classes.dir.resolved" file="projects/bookstore/build/classes" />
-	<resolvepath propertyName="bookstore.conf.dir.resolved" file="projects/bookstore/build/conf" />
+	<resolvepath propertyName="bookstore.classes.dir.resolved" file="fixtures/bookstore/build/classes" />
+	<resolvepath propertyName="bookstore.conf.dir.resolved" file="fixtures/bookstore/build/conf" />
 
 	<path id="incthis">
 		<pathelement dir="${tests.dir.resolved}" />
diff --git a/test/tests/generator/engine/builder/om/php5/GeneratedNestedSetObjectTest.php b/test/testsuite/generator/engine/builder/om/php5/GeneratedNestedSetObjectTest.php
similarity index 100%
rename from test/tests/generator/engine/builder/om/php5/GeneratedNestedSetObjectTest.php
rename to test/testsuite/generator/engine/builder/om/php5/GeneratedNestedSetObjectTest.php
diff --git a/test/tests/generator/engine/builder/om/php5/GeneratedNestedSetPeerTest.php b/test/testsuite/generator/engine/builder/om/php5/GeneratedNestedSetPeerTest.php
similarity index 100%
rename from test/tests/generator/engine/builder/om/php5/GeneratedNestedSetPeerTest.php
rename to test/testsuite/generator/engine/builder/om/php5/GeneratedNestedSetPeerTest.php
diff --git a/test/tests/generator/engine/builder/om/php5/GeneratedNestedSetTest.php b/test/testsuite/generator/engine/builder/om/php5/GeneratedNestedSetTest.php
similarity index 100%
rename from test/tests/generator/engine/builder/om/php5/GeneratedNestedSetTest.php
rename to test/testsuite/generator/engine/builder/om/php5/GeneratedNestedSetTest.php
diff --git a/test/tests/generator/engine/builder/om/php5/GeneratedObjectLobTest.php b/test/testsuite/generator/engine/builder/om/php5/GeneratedObjectLobTest.php
similarity index 100%
rename from test/tests/generator/engine/builder/om/php5/GeneratedObjectLobTest.php
rename to test/testsuite/generator/engine/builder/om/php5/GeneratedObjectLobTest.php
diff --git a/test/tests/generator/engine/builder/om/php5/GeneratedObjectRelTest.php b/test/testsuite/generator/engine/builder/om/php5/GeneratedObjectRelTest.php
similarity index 100%
rename from test/tests/generator/engine/builder/om/php5/GeneratedObjectRelTest.php
rename to test/testsuite/generator/engine/builder/om/php5/GeneratedObjectRelTest.php
diff --git a/test/tests/generator/engine/builder/om/php5/GeneratedObjectTest.php b/test/testsuite/generator/engine/builder/om/php5/GeneratedObjectTest.php
similarity index 100%
rename from test/tests/generator/engine/builder/om/php5/GeneratedObjectTest.php
rename to test/testsuite/generator/engine/builder/om/php5/GeneratedObjectTest.php
diff --git a/test/tests/generator/engine/builder/om/php5/GeneratedPeerTest.php b/test/testsuite/generator/engine/builder/om/php5/GeneratedPeerTest.php
similarity index 100%
rename from test/tests/generator/engine/builder/om/php5/GeneratedPeerTest.php
rename to test/testsuite/generator/engine/builder/om/php5/GeneratedPeerTest.php
diff --git a/test/tests/generator/engine/database/model/ColumnTest.php b/test/testsuite/generator/engine/database/model/ColumnTest.php
similarity index 100%
rename from test/tests/generator/engine/database/model/ColumnTest.php
rename to test/testsuite/generator/engine/database/model/ColumnTest.php
diff --git a/test/tests/generator/engine/database/model/NameFactoryTest.php b/test/testsuite/generator/engine/database/model/NameFactoryTest.php
similarity index 100%
rename from test/tests/generator/engine/database/model/NameFactoryTest.php
rename to test/testsuite/generator/engine/database/model/NameFactoryTest.php
diff --git a/test/tests/generator/engine/database/model/TableTest.php b/test/testsuite/generator/engine/database/model/TableTest.php
similarity index 100%
rename from test/tests/generator/engine/database/model/TableTest.php
rename to test/testsuite/generator/engine/database/model/TableTest.php
diff --git a/test/tests/generator/engine/platform/DefaultPlatformTest.php b/test/testsuite/generator/engine/platform/DefaultPlatformTest.php
similarity index 100%
rename from test/tests/generator/engine/platform/DefaultPlatformTest.php
rename to test/testsuite/generator/engine/platform/DefaultPlatformTest.php
diff --git a/test/tests/generator/engine/platform/PlatformTestBase.php b/test/testsuite/generator/engine/platform/PlatformTestBase.php
similarity index 100%
rename from test/tests/generator/engine/platform/PlatformTestBase.php
rename to test/testsuite/generator/engine/platform/PlatformTestBase.php
diff --git a/test/tests/generator/engine/platform/SqlitePlatformTest.php b/test/testsuite/generator/engine/platform/SqlitePlatformTest.php
similarity index 100%
rename from test/tests/generator/engine/platform/SqlitePlatformTest.php
rename to test/testsuite/generator/engine/platform/SqlitePlatformTest.php
diff --git a/test/tests/misc/CharacterEncodingTest.php b/test/testsuite/misc/CharacterEncodingTest.php
similarity index 100%
rename from test/tests/misc/CharacterEncodingTest.php
rename to test/testsuite/misc/CharacterEncodingTest.php
diff --git a/test/tests/misc/FieldnameRelatedTest.php b/test/testsuite/misc/FieldnameRelatedTest.php
similarity index 100%
rename from test/tests/misc/FieldnameRelatedTest.php
rename to test/testsuite/misc/FieldnameRelatedTest.php
diff --git a/test/tests/misc/Ticket520Test.php b/test/testsuite/misc/Ticket520Test.php
similarity index 100%
rename from test/tests/misc/Ticket520Test.php
rename to test/testsuite/misc/Ticket520Test.php
diff --git a/test/tests/runtime/util/BasePeerTest.php b/test/testsuite/runtime/util/BasePeerTest.php
similarity index 100%
rename from test/tests/runtime/util/BasePeerTest.php
rename to test/testsuite/runtime/util/BasePeerTest.php
diff --git a/test/tests/runtime/util/CriteriaTest.php b/test/testsuite/runtime/util/CriteriaTest.php
similarity index 100%
rename from test/tests/runtime/util/CriteriaTest.php
rename to test/testsuite/runtime/util/CriteriaTest.php
diff --git a/test/tests/runtime/util/JoinTest.php b/test/testsuite/runtime/util/JoinTest.php
similarity index 100%
rename from test/tests/runtime/util/JoinTest.php
rename to test/testsuite/runtime/util/JoinTest.php
diff --git a/test/tests/runtime/util/PropelDateTimeTest.php b/test/testsuite/runtime/util/PropelDateTimeTest.php
similarity index 100%
rename from test/tests/runtime/util/PropelDateTimeTest.php
rename to test/testsuite/runtime/util/PropelDateTimeTest.php
diff --git a/test/tests/runtime/util/PropelPDOTest.php b/test/testsuite/runtime/util/PropelPDOTest.php
similarity index 100%
rename from test/tests/runtime/util/PropelPDOTest.php
rename to test/testsuite/runtime/util/PropelPDOTest.php
diff --git a/test/tests/runtime/validator/ValidatorTest.php b/test/testsuite/runtime/validator/ValidatorTest.php
similarity index 100%
rename from test/tests/runtime/validator/ValidatorTest.php
rename to test/testsuite/runtime/validator/ValidatorTest.php