diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..25f6fa8
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,41 @@
+version: 2
+
+jobs:
+  swift-3:
+    docker:
+      - image: swift:3.1
+      - image: circleci/postgres:latest
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: postgres
+          POSTGRES_PASSWORD: ""
+    steps:
+      - run: eval "$(curl -sL https://apt.vapor.sh)"
+      - run: apt-get install -yq libpq-dev ctls
+      - checkout
+      - run: swift build
+      - run: swift build -c release
+      - run: swift test
+
+  swift-4:
+    docker:
+      - image: swift:4.0
+      - image: circleci/postgres:latest
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: postgres
+          POSTGRES_PASSWORD: ""
+    steps:
+      - run: eval "$(curl -sL https://apt.vapor.sh)"
+      - run: apt-get install -yq libpq-dev ctls
+      - checkout
+      - run: swift build
+      - run: swift build -c release
+      - run: swift test
+
+workflows:
+  version: 2
+  tests:
+    jobs:
+      - swift-3
+      - swift-4
\ No newline at end of file
diff --git a/Tests/PostgreSQLTests/Utilities.swift b/Tests/PostgreSQLTests/Utilities.swift
index 0624520..1ec5374 100644
--- a/Tests/PostgreSQLTests/Utilities.swift
+++ b/Tests/PostgreSQLTests/Utilities.swift
@@ -8,7 +8,7 @@ extension PostgreSQL.Database {
             let postgreSQL = try PostgreSQL.Database(
                 hostname: "127.0.0.1",
                 port: 5432,
-                database: "test",
+                database: "postgres",
                 user: "postgres",
                 password: ""
             )
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 2bdbda5..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-dependencies:
-  override:
-    - eval "$(curl -sL https://apt.vapor.sh)"
-    - sudo apt-get install vapor
-    - sudo chmod -R a+rx /usr/
-
-  pre:
-    - sudo -u postgres createdb test
-
-test:
-  override:
-    - swift build
-    - swift build -c release
-    - swift test