diff --git a/Makefile b/Makefile
index 5e939c1..b515c39 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,10 @@ SHELL := /usr/bin/env bash
 IMAGE ?= w0rp/ale
 CURRENT_IMAGE_ID = 107e4efc4267
 DOCKER_FLAGS = --rm -v $(PWD):/testplugin -v $(PWD)/test:/home "$(IMAGE)"
-tests = test/*
+tests = test/**
 
 test-setup:
+	shopt -s globstar; \
 	docker images -q w0rp/ale | grep ^$(CURRENT_IMAGE_ID) > /dev/null || \
 		docker pull $(IMAGE)
 
diff --git a/test/test_common_handlers.vader b/test/handler/test_common_handlers.vader
similarity index 100%
rename from test/test_common_handlers.vader
rename to test/handler/test_common_handlers.vader
diff --git a/test/test_credo_handler.vader b/test/handler/test_credo_handler.vader
similarity index 100%
rename from test/test_credo_handler.vader
rename to test/handler/test_credo_handler.vader
diff --git a/test/test_eslint_handler.vader b/test/handler/test_eslint_handler.vader
similarity index 100%
rename from test/test_eslint_handler.vader
rename to test/handler/test_eslint_handler.vader
diff --git a/test/test_flow_handler.vader b/test/handler/test_flow_handler.vader
similarity index 100%
rename from test/test_flow_handler.vader
rename to test/handler/test_flow_handler.vader
diff --git a/test/test_fortran_handler.vader b/test/handler/test_fortran_handler.vader
similarity index 100%
rename from test/test_fortran_handler.vader
rename to test/handler/test_fortran_handler.vader
diff --git a/test/test_ghc_handler.vader b/test/handler/test_ghc_handler.vader
similarity index 100%
rename from test/test_ghc_handler.vader
rename to test/handler/test_ghc_handler.vader
diff --git a/test/test_mypy_handler.vader b/test/handler/test_mypy_handler.vader
similarity index 100%
rename from test/test_mypy_handler.vader
rename to test/handler/test_mypy_handler.vader
diff --git a/test/test_nix_handler.vader b/test/handler/test_nix_handler.vader
similarity index 100%
rename from test/test_nix_handler.vader
rename to test/handler/test_nix_handler.vader
diff --git a/test/test_php_handler.vader b/test/handler/test_php_handler.vader
similarity index 100%
rename from test/test_php_handler.vader
rename to test/handler/test_php_handler.vader
diff --git a/test/test_rust_handler.vader b/test/handler/test_rust_handler.vader
similarity index 100%
rename from test/test_rust_handler.vader
rename to test/handler/test_rust_handler.vader
diff --git a/test/test_standard_handler.vader b/test/handler/test_standard_handler.vader
similarity index 100%
rename from test/test_standard_handler.vader
rename to test/handler/test_standard_handler.vader
diff --git a/test/test_typecheck_handler.vader b/test/handler/test_typecheck_handler.vader
similarity index 100%
rename from test/test_typecheck_handler.vader
rename to test/handler/test_typecheck_handler.vader