diff --git a/.travis.yml b/.travis.yml
index 1db06bc2..65384076 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,30 @@
 sudo: false
-cache:
-  directories:
-    - $HOME/.m2
 language: java
 jdk:
+  - oraclejdk8
   - oraclejdk7
   - openjdk7
-  - openjdk6
+
 before_install:
-  - ./before_install.sh
+  - git clone https://github.com/rage/tmc-langs.git
+  - mvn clean install -q -U -Dmaven.test.skip=true -f tmc-langs/pom.xml
+  - git clone https://github.com/rage/tmc-core.git
+  - mvn clean install -q -U -Dmaven.test.skip=true -f tmc-core/pom.xml
+
+cache:
+  directories:
+    - $HOME/.m2
+
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
+  - wget http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905.zip -O netbeans.zip
+  - unzip -q netbeans.zip
+  - mvn -q dependency:get -Dartifact=junit:junit:4.8.2 -DrepoUrl=http://repo1.maven.org/maven2/
+  # To reduce amout of log
+  - cd maven-wrapper/ && mvn -q install && cd ..
+
 script:
-  - mvn clean test
-  - mvn verify
+  - ant -Dcontinue.after.failing.tests=true -Dnbplatform.nb802.netbeans.dest.dir=$PWD/netbeans -Dnbplatform.nb802.harness.dir=$PWD/netbeans/harness test
+
diff --git a/README.markdown b/README.markdown
index f456f083..7cd9ac16 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,5 +1,8 @@
 # Test My Code NetBeans plugin #
 
+[![Build
+Status](https://travis-ci.org/testmycode/tmc-netbeans.svg?branch=core_integration)](https://travis-ci.org/testmycode/tmc-netbeans)
+
 This is a NetBeans plugin for the [Test My Code server](https://github.com/testmycode/tmc-server). It allows downloading, testing and submitting exercises directly from the IDE.
 
 ## Developer setup ##
diff --git a/before_install.sh b/before_install.sh
deleted file mode 100755
index c3e5ac74..00000000
--- a/before_install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# Installs tmc-core
-
-git clone https://github.com/rage/tmc-core.git
-mvn clean install -U -f tmc-core/pom.xml