diff --git a/pom.xml b/pom.xml
index 46e6f83df1..fc6f7bff6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,30 @@
   </modules>
 
   <properties>
-    <project.rootdir>${project.basedir}</project.rootdir>
+    <dep.antlr.generator.version>4.5.3</dep.antlr.generator.version>
+    <dep.antlr.runtime.version>4.7</dep.antlr.runtime.version>
+    <dep.apiguardian.version>1.0.0</dep.apiguardian.version>
+    <dep.batik.version>1.8</dep.batik.version>
+    <dep.cucumber.version>4.2.0</dep.cucumber.version>
+    <dep.gherkin.version>5.0.0</dep.gherkin.version>
+    <dep.hamcrest.version>1.3</dep.hamcrest.version>
+    <dep.junit.platform.version>1.4.0</dep.junit.platform.version>
+    <dep.junit.version>5.4.0</dep.junit.version>
+    <dep.maven.compiler.plugin.version>3.5</dep.maven.compiler.plugin.version>
+    <dep.maven.javadoc.plugin.version>3.0.0</dep.maven.javadoc.plugin.version>
+    <dep.maven.source.plugin.version>3.0.0</dep.maven.source.plugin.version>
+    <dep.maven.surefire.plugin.version>2.22.1</dep.maven.surefire.plugin.version>
+    <dep.scala.maven.plugin.version>3.4.4</dep.scala.maven.plugin.version>
+    <dep.scala.version>2.12.7</dep.scala.version>
+    <dep.scalacheck.version>1.13.5</dep.scalacheck.version>
+    <dep.scalatest.version>3.0.5</dep.scalatest.version>
+    <dep.xmlgraphics-commons.version>2.0</dep.xmlgraphics-commons.version>
     <license.header>${project.rootdir}/ASL-2-header.txt</license.header>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.rootdir>${project.basedir}</project.rootdir>
+    <scala.binary.version>2.12</scala.binary.version>
   </properties>
 
   <developers>
@@ -41,42 +62,264 @@
     </developer>
   </developers>
 
+  <dependencyManagement>
+    <dependencies>
+
+      <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-library</artifactId>
+        <version>${dep.scala.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.opencypher</groupId>
+        <artifactId>tck</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr4-runtime</artifactId>
+        <version>${dep.antlr.runtime.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr4</artifactId>
+        <version>${dep.antlr.generator.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>${dep.junit.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.cucumber</groupId>
+        <artifactId>gherkin</artifactId>
+        <version>${dep.gherkin.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apiguardian</groupId>
+        <artifactId>apiguardian-api</artifactId>
+        <version>${dep.apiguardian.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.cucumber</groupId>
+        <artifactId>cucumber-scala_${scala.binary.version}</artifactId>
+        <version>${dep.cucumber.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.cucumber</groupId>
+        <artifactId>cucumber-junit</artifactId>
+        <version>${dep.cucumber.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-svggen</artifactId>
+        <version>${dep.batik.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-swing</artifactId>
+        <version>${dep.batik.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>xmlgraphics-commons</artifactId>
+        <version>${dep.xmlgraphics-commons.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.scalatest</groupId>
+        <artifactId>scalatest_${scala.binary.version}</artifactId>
+        <version>${dep.scalatest.version}</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.scalacheck</groupId>
+        <artifactId>scalacheck_${scala.binary.version}</artifactId>
+        <version>${dep.scalacheck.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-launcher</artifactId>
+        <version>${dep.junit.platform.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${dep.junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-library</artifactId>
+        <version>${dep.hamcrest.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
+
   <build>
+
+    <pluginManagement>
+      <plugins>
+
+        <plugin>
+          <groupId>net.alchim31.maven</groupId>
+          <artifactId>scala-maven-plugin</artifactId>
+          <version>${dep.scala.maven.plugin.version}</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>compile</goal>
+                <goal>testCompile</goal>
+                <goal>add-source</goal>
+                <goal>doc-jar</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <scalaVersion>${dep.scala.version}</scalaVersion>
+            <scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${dep.maven.surefire.plugin.version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.junit.platform</groupId>
+              <artifactId>junit-platform-launcher</artifactId>
+              <version>${dep.junit.platform.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.junit.jupiter</groupId>
+              <artifactId>junit-jupiter-engine</artifactId>
+              <version>${dep.junit.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.junit.vintage</groupId>
+              <artifactId>junit-vintage-engine</artifactId>
+              <version>${dep.junit.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
+        <plugin>
+          <groupId>org.neo4j.build.plugins</groupId>
+          <artifactId>license-maven-plugin</artifactId>
+          <version>3</version>
+          <executions>
+            <execution>
+              <id>check-licenses</id>
+              <phase>initialize</phase>
+              <goals>
+                <goal>check</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <strictCheck>true</strictCheck>
+            <header>${license.header}</header>
+            <includes>
+              <include>src/**/*.java</include>
+              <include>src/**/*.scala</include>
+              <include>**/*.feature</include>
+              <include>grammar/*.xml</include>
+            </includes>
+            <mapping>
+              <java>SLASHSTAR_STYLE</java>
+              <scala>SLASHSTAR_STYLE</scala>
+              <feature>SCRIPT_STYLE</feature>
+              <xml>XML_STYLE</xml>
+            </mapping>
+            <timestampPropertyName>currentYear</timestampPropertyName>
+            <properties>
+              <inceptionYear>2015</inceptionYear>
+            </properties>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>${dep.maven.source.plugin.version}</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${dep.maven.javadoc.plugin.version}</version>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${dep.maven.compiler.plugin.version}</version>
+          <configuration>
+            <compilerArgs>
+              <arg>-parameters</arg>
+            </compilerArgs>
+          </configuration>
+        </plugin>
+
+      </plugins>
+    </pluginManagement>
+
     <plugins>
-      <plugin>
-        <groupId>org.neo4j.build.plugins</groupId>
-        <artifactId>license-maven-plugin</artifactId>
-        <version>3</version>
-        <executions>
-          <execution>
-            <id>check-licenses</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <strictCheck>true</strictCheck>
-          <header>${license.header}</header>
-          <includes>
-            <include>src/**/*.java</include>
-            <include>src/**/*.scala</include>
-            <include>**/*.feature</include>
-            <include>grammar/*.xml</include>
-          </includes>
-          <mapping>
-            <java>SLASHSTAR_STYLE</java>
-            <scala>SLASHSTAR_STYLE</scala>
-            <feature>SCRIPT_STYLE</feature>
-            <xml>XML_STYLE</xml>
-          </mapping>
-          <timestampPropertyName>currentYear</timestampPropertyName>
-          <properties>
-            <inceptionYear>2015</inceptionYear>
-          </properties>
-        </configuration>
-      </plugin>
+        <plugin>
+          <groupId>org.neo4j.build.plugins</groupId>
+          <artifactId>license-maven-plugin</artifactId>
+        </plugin>
     </plugins>
   </build>
 
diff --git a/tck/pom.xml b/tck/pom.xml
index 0797eb59ba..ebca68c6d7 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -11,7 +11,6 @@
   </parent>
 
   <artifactId>tck</artifactId>
-  <version>1.0-SNAPSHOT</version>
   <name>openCypher TCK Features and Graphs</name>
   <url>http://opencypher.org</url>
   <description>
diff --git a/tools/grammar/pom.xml b/tools/grammar/pom.xml
index 566fdf02f5..cce9011d4e 100644
--- a/tools/grammar/pom.xml
+++ b/tools/grammar/pom.xml
@@ -11,7 +11,6 @@
   </parent>
 
   <artifactId>grammar</artifactId>
-  <version>1.0-SNAPSHOT</version>
   <name>openCypher Grammar Developer Tools</name>
   <url>http://opencypher.org</url>
   <description>openCypher Grammar</description>
@@ -31,46 +30,42 @@
   </licenses>
 
   <dependencies>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4</artifactId>
-      <version>${antlr.generator.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>${antlr.runtime.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>batik-svggen</artifactId>
-      <version>1.8</version>
-      <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>batik-swing</artifactId>
-      <version>1.8</version>
-      <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>xmlgraphics-commons</artifactId>
-      <version>2.0</version>
-      <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
diff --git a/tools/grammar/src/main/shell/launch.sh b/tools/grammar/src/main/shell/launch.sh
index d3763f548e..d8b7c43ef7 100755
--- a/tools/grammar/src/main/shell/launch.sh
+++ b/tools/grammar/src/main/shell/launch.sh
@@ -8,9 +8,10 @@ case "$(basename $0)" in
         JARFILE="$(cd $(dirname $0); pwd)/$(basename $0)"
         ;;
     launch.sh)
-        VERSION="$(grep -A1 '<artifactId>grammar</artifactId>' $(dirname $0)/../../../pom.xml | grep -m1 version | cut -d\> -f2 | cut -d\< -f1)"
+        pomfile="$(cd "$(dirname $0)/../../../../.."; pwd)/pom.xml"
+        VERSION=$(grep --max-count=1 --regexp="<version>[^<]*" "$pomfile" | cut -f2 -d ">" | cut -f1 -d "<")
         if [[ -z "$VERSION" ]]; then
-            >&2 echo "Cannot find version in $(cd $(dirname $0)/../../..; pwd)/pom.xml"
+            >&2 echo "Cannot find version in $pomfile"
             exit 1
         fi
         JARFILE="$(cd $(dirname $0)/../../..; pwd)/target/grammar-${VERSION}.jar"
diff --git a/tools/pom.xml b/tools/pom.xml
index 59596dba61..dc69777800 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -11,7 +11,6 @@
 
   <artifactId>tools</artifactId>
   <packaging>pom</packaging>
-  <version>1.0-SNAPSHOT</version>
   <name>tools</name>
   <url>http://opencypher.org</url>
   <description>openCypher Developer Tools</description>
@@ -21,9 +20,6 @@
 
   <properties>
     <project.rootdir>${project.basedir}/..</project.rootdir>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <antlr.runtime.version>4.7</antlr.runtime.version>
-    <antlr.generator.version>4.5.3</antlr.generator.version>
   </properties>
 
   <licenses>
@@ -35,44 +31,22 @@
 
   <build>
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <compilerArgs>
-            <arg>-parameters</arg>
-          </compilerArgs>
-        </configuration>
       </plugin>
+
     </plugins>
   </build>
 
diff --git a/tools/tck-api/pom.xml b/tools/tck-api/pom.xml
index 3bcb50ad88..c50071f2a4 100644
--- a/tools/tck-api/pom.xml
+++ b/tools/tck-api/pom.xml
@@ -10,15 +10,12 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>tck-api</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <artifactId>tck-api_2.12</artifactId>
   <name>openCypher TCK API</name>
   <url>http://opencypher.org</url>
   <description>openCypher Technology Compatibility Kit API</description>
 
   <properties>
-    <scala.version>2.11.7</scala.version>
-    <scala.binary.version>2.11</scala.binary.version>
     <project.rootdir>${project.basedir}/../..</project.rootdir>
   </properties>
 
@@ -34,114 +31,65 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.2.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>testCompile</goal>
-              <goal>add-source</goal>
-              <goal>doc-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <scalaVersion>${scala.version}</scalaVersion>
-          <scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>1.0.2</version>
-          </dependency>
-          <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>4.12.2</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
-
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
-      <version>${scala.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opencypher</groupId>
       <artifactId>tck</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>${antlr.runtime.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.cucumber</groupId>
       <artifactId>gherkin</artifactId>
-      <version>5.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>org.apiguardian</groupId>
       <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
     </dependency>
 
     <!-- Test deps -->
 
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.11</artifactId>
-      <version>2.2.6</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-      </exclusions>
+      <artifactId>scalatest_${scala.binary.version}</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.scalacheck</groupId>
-      <artifactId>scalacheck_2.11</artifactId>
-      <version>1.13.0</version>
-      <scope>test</scope>
+      <artifactId>scalacheck_${scala.binary.version}</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.0.2</version>
-      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.0.2</version>
-      <scope>test</scope>
     </dependency>
-
   </dependencies>
+
 </project>
diff --git a/tools/tck-integrity-tests/pom.xml b/tools/tck-integrity-tests/pom.xml
index b188b4db21..228d47c1b3 100644
--- a/tools/tck-integrity-tests/pom.xml
+++ b/tools/tck-integrity-tests/pom.xml
@@ -10,15 +10,12 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>tck-integrity-tests</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <artifactId>tck-integrity-tests_2.12</artifactId>
   <name>openCypher TCK Integrity Tests</name>
   <url>http://opencypher.org</url>
   <description>openCypher Technology Compatibility Kit Integrity Tests</description>
 
   <properties>
-    <scala.version>2.11.7</scala.version>
-    <scala.binary.version>2.11</scala.binary.version>
     <project.rootdir>${project.basedir}/../..</project.rootdir>
   </properties>
 
@@ -34,39 +31,12 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.2.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>testCompile</goal>
-              <goal>add-source</goal>
-              <goal>doc-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <scalaVersion>${scala.version}</scalaVersion>
-          <scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>1.0.2</version>
-          </dependency>
-          <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>4.12.2</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
+
     <resources>
       <resource>
         <directory>../../grammar</directory>
@@ -80,27 +50,23 @@
   <dependencies>
 
     <dependency>
-      <groupId>info.cukes</groupId>
-      <artifactId>cucumber-scala_2.11</artifactId>
-      <version>1.2.4</version>
+      <groupId>io.cucumber</groupId>
+      <artifactId>cucumber-scala_${scala.binary.version}</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>info.cukes</groupId>
+      <groupId>io.cucumber</groupId>
       <artifactId>cucumber-junit</artifactId>
-      <version>1.2.4</version>
     </dependency>
 
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
-      <version>${scala.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>${antlr.runtime.version}</version>
     </dependency>
 
     <!-- Test deps -->
@@ -108,33 +74,21 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.11</artifactId>
-      <version>2.2.6</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-      </exclusions>
+      <artifactId>scalatest_${scala.binary.version}</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.scalacheck</groupId>
-      <artifactId>scalacheck_2.11</artifactId>
-      <version>1.13.0</version>
-      <scope>test</scope>
+      <artifactId>scalacheck_${scala.binary.version}</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.opencypher</groupId>
-      <artifactId>tck-api</artifactId>
+      <artifactId>tck-api_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/FeatureFormatChecker.scala b/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/FeatureFormatChecker.scala
index c9cc4f6f15..1b9f651bc3 100644
--- a/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/FeatureFormatChecker.scala
+++ b/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/FeatureFormatChecker.scala
@@ -29,7 +29,7 @@ package org.opencypher.tools.tck
 
 import java.util.concurrent.atomic.AtomicInteger
 
-import cucumber.api.DataTable
+import io.cucumber.datatable.DataTable
 import org.opencypher.tools.tck.api.InvalidFeatureFormatException
 import org.opencypher.tools.tck.constants.TCKStepDefinitions._
 
diff --git a/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateParameters.scala b/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateParameters.scala
index 27001a0b09..4071447138 100644
--- a/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateParameters.scala
+++ b/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateParameters.scala
@@ -27,7 +27,7 @@
  */
 package org.opencypher.tools.tck
 
-import cucumber.api.DataTable
+import io.cucumber.datatable.DataTable
 import org.opencypher.tools.tck.parsing.FormatListener
 
 import scala.collection.JavaConverters._
@@ -41,8 +41,7 @@ object validateParameters extends (DataTable => Option[String]) {
 
   override def apply(table: DataTable): Option[String] = {
     // TODO: Specify constraints for parameter keys, and enforce these here
-    // val keys = table.transpose().topCells().asScala
-    val values = table.transpose().cells(1).asScala.head.asScala
+    val values = table.transpose().row(1).asScala
 
     val badValues = values.filterNot(this (_))
     if (badValues.isEmpty) None
diff --git a/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateResults.scala b/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateResults.scala
index aba751a890..671c62514f 100644
--- a/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateResults.scala
+++ b/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateResults.scala
@@ -27,7 +27,7 @@
  */
 package org.opencypher.tools.tck
 
-import cucumber.api.DataTable
+import io.cucumber.datatable.DataTable
 import org.opencypher.tools.tck.parsing.FormatListener
 
 import scala.collection.JavaConverters._
@@ -41,8 +41,8 @@ object validateResults extends (DataTable => Option[String]) {
 
   override def apply(table: DataTable): Option[String] = {
     // TODO: Specify constraints for column names, and enforce these here
-    val keys = table.topCells().asScala
-    val cells = table.cells(1).asScala
+    val keys = table.cells().asScala.head
+    val cells = table.cells().asScala.tail
 
     val badValues = cells.flatMap { list =>
       list.asScala.filterNot(this (_))
diff --git a/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateSideEffects.scala b/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateSideEffects.scala
index 5568c083b1..40c10e6aba 100644
--- a/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateSideEffects.scala
+++ b/tools/tck-integrity-tests/src/main/scala/org/opencypher/tools/tck/validateSideEffects.scala
@@ -27,7 +27,7 @@
  */
 package org.opencypher.tools.tck
 
-import cucumber.api.DataTable
+import io.cucumber.datatable.DataTable
 import org.opencypher.tools.tck.constants.TCKSideEffects
 
 import scala.collection.JavaConverters._
@@ -39,8 +39,8 @@ import scala.collection.JavaConverters._
 object validateSideEffects extends (DataTable => Option[String]) {
 
   override def apply(table: DataTable): Option[String] = {
-    val keys = table.transpose().topCells().asScala
-    val values = table.transpose().cells(1).asScala.head.asScala
+    val keys = table.transpose().row(0).asScala
+    val values = table.transpose().rows(1).asList.asScala
 
     val msg = s"""${checkKeys(keys)}
                  |${checkValues(values)}""".stripMargin
diff --git a/tools/tck-integrity-tests/src/test/scala/org/opencypher/tools/tck/TckTestSupport.scala b/tools/tck-integrity-tests/src/test/scala/org/opencypher/tools/tck/TckTestSupport.scala
index 31a233a5fd..cb7a323b50 100644
--- a/tools/tck-integrity-tests/src/test/scala/org/opencypher/tools/tck/TckTestSupport.scala
+++ b/tools/tck-integrity-tests/src/test/scala/org/opencypher/tools/tck/TckTestSupport.scala
@@ -27,7 +27,7 @@
  */
 package org.opencypher.tools.tck
 
-import cucumber.api.DataTable
+import io.cucumber.datatable.DataTable
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.{FunSuiteLike, Matchers}