diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62b190ef2efd423a7d4cebc027c9e32440e501fc..487d6c19af5d73671fae80909bb6a1b71c822c8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: node:6
+image: node:8
 
 # Set up MySQL test-database
 services:
@@ -6,7 +6,7 @@ services:
 
 # Configure test-database
 variables:
-  MYSQL_DATABASE: db
+  MYSQL_DATABASE: supertestdb
   MYSQL_ROOT_PASSWORD: secret
   
 # Install node libraries
diff --git a/dao/persondao.test.js b/dao/persondao.test.js
index f9e3cd2c3554580f4198d54bf47d9f2cd7b66877..a7028f1108d81baca67f229bffd2cd3c878e5486 100644
--- a/dao/persondao.test.js
+++ b/dao/persondao.test.js
@@ -5,33 +5,35 @@ var pool = mysql.createPool({
   host: "mysql",
   user: "root",
   password: "secret",
-  database: "db",
+  database: "supertestdb",
   debug: false
 });
 
-test("query db", () => {
+test("query db", done => {
   console.log("Connecting to database");
-/*  pool.getConnection((err, connection) => {
+  
+  function callback(data) {
+    console.log("Callback: " + data);
+    expect(data).toBe("SUCCESS");
+    done();
+  }
+
+  pool.getConnection((err, connection) => {
     console.log("Connected to database");
     if (err) {
-      console.log("Feil ved kobling til databasen");
-      res.json({ error: "feil ved ved oppkobling" });
+      callback("Feil ved kobling til databasen");
     } else {
       connection.query(
-        "select navn, alder, adresse from person",
+        "select 1",
         (err, rows) => {
           connection.release();
           if (err) {
-            console.log(err);
-            res.json({ error: "error querying" });
+            callback(err);
           } else {
-            console.log("returning rows");
-            res.json(rows);
+            callback("SUCCESS");
           }
         }
       );
     }
-  }); */
-
-  expect(3).toBe(3);
+  });
 });
\ No newline at end of file