diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..4a9e27f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: php
+php:
+- 5.3
+- 5.4
+- 5.5
+- 5.6
+- 7.0
+- hhvm
+matrix:
+  allow_failures:
+  - php: hhvm
+before_script: composer update --dev
+script: php vendor/phpunit/phpunit/phpunit.php
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 455be21..1911285 100644
--- a/composer.json
+++ b/composer.json
@@ -7,5 +7,16 @@
     },
     "autoload": {
         "psr-4": {"SimpleSAML\\Module\\authVHO\\": "lib"}
+    },
+    "require-dev": {
+        "simplesamlphp/simplesamlphp": "1.14",
+        "phpunit/phpunit": "~3.7"
+    },
+    "autoload-dev": {
+      "files": ["tests/_autoload_modules.php"]
+    },
+    "support": {
+        "issues": "https://github.com/NIIF/simplesamlphp-module-authVHO/issues",
+        "source": "https://github.com/NIIF/simplesamlphp-module-authVHO"
     }
 }
\ No newline at end of file
diff --git a/lib/Auth/Process/RedirectTest.php b/lib/Auth/Process/RedirectTest.php
deleted file mode 100644
index 8e55dc7..0000000
--- a/lib/Auth/Process/RedirectTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * A simple processing filter for testing that redirection works as it should.
- *
- */
-class sspmod_authVHO_Auth_Process_RedirectTest extends SimpleSAML_Auth_ProcessingFilter {
-
-
-	/**
-	 * Initialize processing of the redirect test.
-	 *
-	 * @param array &$state  The state we should update.
-	 */
-	public function process(&$state) {
-		assert('is_array($state)');
-		assert('array_key_exists("Attributes", $state)');
-
-		// To check whether the state is saved correctly
-		$state['Attributes']['RedirectTest1'] = array('OK');
-
-		// Save state and redirect
-		$id = SimpleSAML_Auth_State::saveState($state, 'authVHO:redirectfilter-test');
-		$url = SimpleSAML_Module::getModuleURL('authVHO/redirecttest.php');
-		\SimpleSAML\Utils\HTTP::redirectTrustedURL($url, array('StateId' => $id));
-	}
-
-}
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..8a094a7
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit bootstrap="./vendor/autoload.php">
+    <testsuites>
+        <testsuite name="The project's test suite">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
\ No newline at end of file
diff --git a/tests/Auth/Process/RedirectTest.php b/tests/Auth/Process/RedirectTest.php
new file mode 100644
index 0000000..a24070d
--- /dev/null
+++ b/tests/Auth/Process/RedirectTest.php
@@ -0,0 +1,33 @@
+<?php
+namespace SimpleSAML\Module\authVHO\Auth\Process;
+
+use SimpleSAML\Module;
+use SimpleSAML_Auth_ProcessingFilter;
+use SimpleSAML_Auth_State;
+use SimpleSAML\Utils;
+
+/**
+ * A simple processing filter for testing that redirection works as it should.
+ *
+ */
+class RedirectTest extends SimpleSAML_Auth_ProcessingFilter
+{
+    /**
+     * Initialize processing of the redirect test.
+     *
+     * @param array &$state  The state we should update.
+     */
+    public function process(&$state)
+    {
+        assert('is_array($state)');
+        assert('array_key_exists("Attributes", $state)');
+
+        // To check whether the state is saved correctly
+        $state['Attributes']['RedirectTest1'] = array('OK');
+
+        // Save state and redirect
+        $id = SimpleSAML_Auth_State::saveState($state, 'authVHO:redirectfilter-test');
+        $url = Module::getModuleURL('authVHO/redirecttest.php');
+        HTTP::redirectTrustedURL($url, array('StateId' => $id));
+    }
+}