diff --git a/.travis.yml b/.travis.yml
index ca3f3e87..941b3808 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ matrix:
       os: linux
       compiler: gcc
       env:
-        - MAKETARGET="test-all tidy-all check-format check-metadata check-license-files"
+        - MAKETARGET="test-all tidy-all check-format check-metadata"
       addons:
         apt:
           packages:
diff --git a/Makefile b/Makefile
index 80df2470..80722184 100644
--- a/Makefile
+++ b/Makefile
@@ -175,14 +175,6 @@ run-sanitizer-all: sanitizer-all
 	done
 	@echo Tests completed
 
-.PHONY: check-license-files
-check-license-files:
-	@echo Checking that LICENSE files exist
-	@for scheme in $(ALL_SCHEMES); do \
-		echo Checking for  $$scheme/clean/LICENSE;\
-		test -f $$scheme/clean/LICENSE || exit 1 ;\
-	done
-
 .PHONY: test-all
 test-all: run-functest-all run-valgrind-all run-sanitizer-all run-testvectors-all
 
diff --git a/test/test_compile_lib.py b/test/test_compile_lib.py
index e2896a17..d53df8cb 100644
--- a/test/test_compile_lib.py
+++ b/test/test_compile_lib.py
@@ -13,6 +13,10 @@ def test_compile_lib():
 
 def check_compile_lib(scheme_name, implementation_name):
     implementation = pqclean.Implementation.by_name(scheme_name, implementation_name)
+    helpers.run_subprocess(
+        ['make', 'clean'],
+        implementation.path()
+    )
     helpers.run_subprocess(
         ['make'],
         implementation.path()
diff --git a/test/test_functest.py b/test/test_functest.py
index c54b7c96..b40ad2c9 100644
--- a/test/test_functest.py
+++ b/test/test_functest.py
@@ -13,10 +13,6 @@ def test_functest():
 
 def check_functest(scheme_name, implementation_name):
     implementation = pqclean.Implementation.by_name(scheme_name, implementation_name)
-    helpers.run_subprocess(
-        ['make', 'clean', 'TYPE=' + implementation.scheme.type, 'SCHEME=' + scheme_name, 'IMPLEMENTATION=' + implementation_name],
-        os.path.join('..', 'test')
-    )
     helpers.run_subprocess(
         ['make', 'TYPE=' + implementation.scheme.type, 'SCHEME=' + scheme_name, 'IMPLEMENTATION=' + implementation_name],
         os.path.join('..', 'test')
diff --git a/test/test_symbol_namespace.py b/test/test_symbol_namespace.py
index c24edcb2..33386b5f 100644
--- a/test/test_symbol_namespace.py
+++ b/test/test_symbol_namespace.py
@@ -16,10 +16,6 @@ def test_symbol_namespace():
 
 def check_symbol_namespace(scheme_name, implementation_name):
     implementation = pqclean.Implementation.by_name(scheme_name, implementation_name)
-    helpers.run_subprocess(
-        ['make', 'clean'],
-        implementation.path()
-    )
     helpers.run_subprocess(
         ['make'],
         implementation.path()