diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..e091954e0e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,33 @@
+language: php
+php:
+  - 5.2
+  - 5.3
+  - 5.4
+
+env:
+  - DB=mysql
+  - DB=postgres
+
+before_script:
+  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' ]; then pyrus install --force phpunit/DbUnit; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.4' ]; then pyrus install --force phpunit/DbUnit; fi"
+  - phpenv rehash
+
+script:
+  - phpunit --configuration travis/$DB.travis.xml
+
+notifications:
+  email:
+    recipients:
+      - m@michaelcullum.com
+    on_success: never
+    on_failure: always
+
+branches:
+  only:
+    develop
+    task/travis
diff --git a/travis/mysql.travis.xml b/travis/mysql.travis.xml
new file mode 100644
index 0000000000..a849f50136
--- /dev/null
+++ b/travis/mysql.travis.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+		 strict="true"
+         bootstrap="../tests/bootstrap.php">
+	<testsuites>
+		<testsuite name="phpBB Test Suite">
+			<directory suffix="_test.php">../tests/</directory>
+		</testsuite>
+	</testsuites>
+
+	<php>
+		<const name="dbms" value="mysqli"/>
+		<const name="dbhost" value="0.0.0.0" />
+		<const name="dbport" value="3306" />
+		<const name="dbname" value="phpbb_tests" />
+		<const name="dbuser" value="root" />
+		<const name="dbpasswd" value="" />
+		<const name="table_prefix" value="phpbb_"/>
+	</php>
+</phpunit>
diff --git a/travis/postgres.travis.xml b/travis/postgres.travis.xml
new file mode 100644
index 0000000000..e44696a335
--- /dev/null
+++ b/travis/postgres.travis.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+		 strict="true"
+         bootstrap="../tests/bootstrap.php">
+	<testsuites>
+		<testsuite name="phpBB Test Suite">
+			<directory suffix="_test.php">../tests/</directory>
+		</testsuite>
+	</testsuites>
+
+	<php>
+		<!-- "Real" test database -->
+		<!-- uncomment, otherwise sqlite memory runs -->
+		<const name="dbms" value="postgres"/>
+		<const name="dbhost" value="localhost" />
+		<const name="dbport" value="5432" />
+		<const name="dbname" value="phpbb_tests" />
+		<const name="dbuser" value="postgres" />
+		<const name="dbpasswd" value="" />
+		<const name="table_prefix" value="phpbb_"/>
+	</php>
+</phpunit>