diff --git a/.gitignore b/.gitignore
index 65faf96a09c7609b04ac20e340f8a4f591650014..d11b672b22c6edf59e88b6d435d9eccd12d89603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 # Generated by Cargo
 # will have compiled files and executables
 /target/
-/examples/target/
+/tests/target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e73696f776d0924e28d8d75fa90786c1dce1bba6..80af7aa636f06050e0d2ce0f44934a257ddbfc6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,13 +33,13 @@ build:
   cache:
     paths:
       - target/x86_64-unknown-hermit-kernel
-      - examples/target/x86_64-unknown-hermit
+      - tests/target/x86_64-unknown-hermit
       - loader/target/x86_64-unknown-hermit-loader
     key: build
   artifacts:
     paths:
       - target/x86_64-unknown-hermit-kernel
-      - examples/target/x86_64-unknown-hermit
+      - tests/target/x86_64-unknown-hermit
       - loader/target/x86_64-unknown-hermit-loader
   tags:
     - docker
@@ -50,7 +50,7 @@ build:
 test:tarpaulin:
   stage: test
   script:
-    - rm -rf examples loader
+    - rm -rf tests loader
     - cargo tarpaulin -v --exclude-files src/arch/aarch64
   image: ${IMAGE}
   tags:
@@ -68,8 +68,8 @@ test:uhyve:
   stage: test
   script:
     - cargo install --git https://github.com/hermitcore/uhyve.git
-    - HERMIT_VERBOSE=1 uhyve examples/target/x86_64-unknown-hermit/debug/hctests
-    - HERMIT_VERBOSE=1 uhyve examples/target/x86_64-unknown-hermit/release/hctests
+    - HERMIT_VERBOSE=1 uhyve tests/target/x86_64-unknown-hermit/debug/hctests
+    - HERMIT_VERBOSE=1 uhyve tests/target/x86_64-unknown-hermit/release/hctests
   image: ${IMAGE}
   dependencies:
     - build
diff --git a/Cargo.toml b/Cargo.toml
index 231bdcf73a64fccc4224d25069b2bd9218890e0c..9f9410f7934ce9ebaa17831b45a7e87921b8f18e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["os"]
 description = """
 RustyHermit - A Rust-based, lightweight unikernel
 """
-exclude = ["/loader/*", "/examples/*", "/.travis.yml", "/.gitlab-ci.yml", ".gitignore", "/.devcontainer/*", "/.vscode/*"]
+exclude = ["/loader/*", "/tests/*", "/.travis.yml", "/.gitlab-ci.yml", ".gitignore", "/.devcontainer/*", "/.vscode/*"]
 
 [badges]
 travis-ci = { repository = "hermitcore/libhermit-rs" }
diff --git a/Makefile b/Makefile
index 8f5e211e0e89c642f7476eb6c3ff719a8cce7429..c14ed23d8e616b6890f6727ad2f9c784bcbb10e7 100644
--- a/Makefile
+++ b/Makefile
@@ -17,24 +17,24 @@ else
 RM := rm -rf
 endif
 
-.PHONY: all loader clippy clean lib docs
+.PHONY: all loader tests clippy clean lib docs
 
 default: lib
-	make arch=$(arch) release=$(release) -C examples
+	make arch=$(arch) release=$(release) -C tests
 
 all: loader lib
-	make arch=$(arch) release=$(release) -C examples
+	make arch=$(arch) release=$(release) -C tests
 
 clean:
 	$(RM) target/x86_64-unknown-hermit-kernel
-	make -C examples clean
+	make -C tests clean
 	make -C loader clean
 
 loader:
 	make -C loader release=$(release)
 
 qemu:
-	qemu-system-x86_64 -display none -smp 1 -m 1G -serial stdio  -kernel loader/target/$(target)-loader/$(rdir)/hermit-loader -initrd examples/target/$(target)/$(rdir)/hctests -cpu Haswell-noTSX,vendor=GenuineIntel
+	qemu-system-x86_64 -display none -smp 1 -m 1G -serial stdio  -kernel loader/target/$(target)-loader/$(rdir)/hermit-loader -initrd tests/target/$(target)/$(rdir)/hctests -cpu Haswell-noTSX,vendor=GenuineIntel
 
 docs:
 	@echo DOC
diff --git a/examples/Cargo.toml b/tests/Cargo.toml
similarity index 100%
rename from examples/Cargo.toml
rename to tests/Cargo.toml
diff --git a/examples/Makefile b/tests/Makefile
similarity index 100%
rename from examples/Makefile
rename to tests/Makefile
diff --git a/examples/src/main.rs b/tests/src/main.rs
similarity index 100%
rename from examples/src/main.rs
rename to tests/src/main.rs
diff --git a/examples/src/tests/laplace.rs b/tests/src/tests/laplace.rs
similarity index 100%
rename from examples/src/tests/laplace.rs
rename to tests/src/tests/laplace.rs
diff --git a/examples/src/tests/matmul.rs b/tests/src/tests/matmul.rs
similarity index 100%
rename from examples/src/tests/matmul.rs
rename to tests/src/tests/matmul.rs
diff --git a/examples/src/tests/mod.rs b/tests/src/tests/mod.rs
similarity index 100%
rename from examples/src/tests/mod.rs
rename to tests/src/tests/mod.rs