diff --git a/.classpath b/.classpath
index 77e8068a..29aaa1bc 100644
--- a/.classpath
+++ b/.classpath
@@ -16,6 +16,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="src" output="target/test-classes" path="tests">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
index b20f47ad..5c617e1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,7 @@
 	</properties>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>tests</testSourceDirectory>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -219,5 +220,10 @@
 			<artifactId>jetty-rewrite</artifactId>
 			<version>9.4.11.v20180605</version>
 		</dependency>
+		<dependency>
+			<groupId>org.bitcoinj</groupId>
+			<artifactId>bitcoinj-core</artifactId>
+			<version>0.14.7</version>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/src/test/ATTests.java b/tests/test/ATTests.java
similarity index 100%
rename from src/test/ATTests.java
rename to tests/test/ATTests.java
diff --git a/src/test/BlockTests.java b/tests/test/BlockTests.java
similarity index 100%
rename from src/test/BlockTests.java
rename to tests/test/BlockTests.java
diff --git a/src/test/BlockchainTests.java b/tests/test/BlockchainTests.java
similarity index 100%
rename from src/test/BlockchainTests.java
rename to tests/test/BlockchainTests.java
diff --git a/src/test/Common.java b/tests/test/Common.java
similarity index 100%
rename from src/test/Common.java
rename to tests/test/Common.java
diff --git a/src/test/CompatibilityTests.java b/tests/test/CompatibilityTests.java
similarity index 100%
rename from src/test/CompatibilityTests.java
rename to tests/test/CompatibilityTests.java
diff --git a/src/test/CryptoTests.java b/tests/test/CryptoTests.java
similarity index 100%
rename from src/test/CryptoTests.java
rename to tests/test/CryptoTests.java
diff --git a/src/test/ExceptionTests.java b/tests/test/ExceptionTests.java
similarity index 100%
rename from src/test/ExceptionTests.java
rename to tests/test/ExceptionTests.java
diff --git a/src/test/GenesisTests.java b/tests/test/GenesisTests.java
similarity index 100%
rename from src/test/GenesisTests.java
rename to tests/test/GenesisTests.java
diff --git a/src/test/GlobalizationTests.java b/tests/test/GlobalizationTests.java
similarity index 100%
rename from src/test/GlobalizationTests.java
rename to tests/test/GlobalizationTests.java
diff --git a/src/test/LoadTests.java b/tests/test/LoadTests.java
similarity index 100%
rename from src/test/LoadTests.java
rename to tests/test/LoadTests.java
diff --git a/src/test/NavigationTests.java b/tests/test/NavigationTests.java
similarity index 100%
rename from src/test/NavigationTests.java
rename to tests/test/NavigationTests.java
diff --git a/src/test/RepositoryTests.java b/tests/test/RepositoryTests.java
similarity index 100%
rename from src/test/RepositoryTests.java
rename to tests/test/RepositoryTests.java
diff --git a/src/test/SaveTests.java b/tests/test/SaveTests.java
similarity index 100%
rename from src/test/SaveTests.java
rename to tests/test/SaveTests.java
diff --git a/src/test/SerializationTests.java b/tests/test/SerializationTests.java
similarity index 100%
rename from src/test/SerializationTests.java
rename to tests/test/SerializationTests.java
diff --git a/src/test/SignatureTests.java b/tests/test/SignatureTests.java
similarity index 100%
rename from src/test/SignatureTests.java
rename to tests/test/SignatureTests.java
diff --git a/src/test/TransactionTests.java b/tests/test/TransactionTests.java
similarity index 100%
rename from src/test/TransactionTests.java
rename to tests/test/TransactionTests.java
diff --git a/src/test/utils/AssertExtensions.java b/tests/test/utils/AssertExtensions.java
similarity index 100%
rename from src/test/utils/AssertExtensions.java
rename to tests/test/utils/AssertExtensions.java
diff --git a/src/test/utils/EqualityComparer.java b/tests/test/utils/EqualityComparer.java
similarity index 100%
rename from src/test/utils/EqualityComparer.java
rename to tests/test/utils/EqualityComparer.java
diff --git a/src/test/utils/EquatableWrapper.java b/tests/test/utils/EquatableWrapper.java
similarity index 100%
rename from src/test/utils/EquatableWrapper.java
rename to tests/test/utils/EquatableWrapper.java