diff --git a/Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift b/Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift
index 7afa965b..09c36924 100644
--- a/Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift
+++ b/Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift
@@ -338,8 +338,8 @@ class PostgreSQLConnectionTests: XCTestCase {
         SELECT "categories".* FROM "categories" WHERE ("categories"."id" = $1) LIMIT 1 OFFSET 0
         """, [1])
 
-        try print(acronyms.wait())
-        try print(categories.wait())
+        _ = try acronyms.wait()
+        _ = try categories.wait()
     }
 
     static var allTests = [
diff --git a/circle.yml b/circle.yml
index 97c80d69..722e3113 100644
--- a/circle.yml
+++ b/circle.yml
@@ -10,19 +10,13 @@ jobs:
       - run: swift test
   linux:
     docker:
-      - image: norionomura/swift:swift-4.1-branch
+      - image: codevapor/swift:4.1
       - image: circleci/postgres:latest
         environment:
           POSTGRES_USER: vapor_username
           POSTGRES_DB: vapor_database
           POSTGRES_PASSWORD: vapor_password
     steps:
-      - run:
-          name: Update APT
-          command: apt-get update
-      - run:
-          name: Install Swift NIO dependencies
-          command: apt-get install -yq pkg-config libssl-dev
       - checkout
       - run: 
           name: Compile code
@@ -36,19 +30,13 @@ jobs:
 
   linux-fluent:
     docker:
-      - image: norionomura/swift:swift-4.1-branch
+      - image: codevapor/swift:4.1
       - image: circleci/postgres:latest
         environment:
           POSTGRES_USER: vapor_username
           POSTGRES_DB: vapor_database
           POSTGRES_PASSWORD: vapor_password
     steps:
-      - run:
-          name: Update APT
-          command: apt-get update
-      - run:
-          name: Install Swift NIO dependencies
-          command: apt-get install -yq pkg-config libssl-dev
       - run:
           name: Clone Fluent PostgreSQL
           command: git clone -b nio https://github.com/vapor/fluent-postgresql.git