diff --git a/crypto_kem/ntruhps2048509/clean/api.h b/crypto_kem/ntruhps2048509/clean/api.h
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/crypto_sort.c b/crypto_kem/ntruhps2048509/clean/crypto_sort.c
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/crypto_sort.h b/crypto_kem/ntruhps2048509/clean/crypto_sort.h
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/kem.c b/crypto_kem/ntruhps2048509/clean/kem.c
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/owcpa.c b/crypto_kem/ntruhps2048509/clean/owcpa.c
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/owcpa.h b/crypto_kem/ntruhps2048509/clean/owcpa.h
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/pack3.c b/crypto_kem/ntruhps2048509/clean/pack3.c
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/packq.c b/crypto_kem/ntruhps2048509/clean/packq.c
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/params.h b/crypto_kem/ntruhps2048509/clean/params.h
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/poly.c b/crypto_kem/ntruhps2048509/clean/poly.c
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/poly.h b/crypto_kem/ntruhps2048509/clean/poly.h
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/sample.c b/crypto_kem/ntruhps2048509/clean/sample.c
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/sample.h b/crypto_kem/ntruhps2048509/clean/sample.h
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/verify.c b/crypto_kem/ntruhps2048509/clean/verify.c
old mode 100755
new mode 100644
diff --git a/crypto_kem/ntruhps2048509/clean/verify.h b/crypto_kem/ntruhps2048509/clean/verify.h
old mode 100755
new mode 100644
diff --git a/test/test_functest.py b/test/test_functest.py
index f707e491..d7696881 100644
--- a/test/test_functest.py
+++ b/test/test_functest.py
@@ -53,29 +53,32 @@ def check_functest_sanitizers(implementation):
     else:
         print("Supported platform: {}".format(platform.machine()))
 
-    helpers.ensure_available('valgrind')
     helpers.make('clean-scheme', 'functest',
                  TYPE=implementation.scheme.type,
                  SCHEME=implementation.scheme.name,
                  IMPLEMENTATION=implementation.name,
-                 EXTRAFLAGS='-fsanitize=address,undefined',
+                 EXTRAFLAGS='-g -fsanitize=address,undefined',
                  working_dir=os.path.join('..', 'test'),
                  env=env)
-    helpers.run_subprocess(
-        [os.path.join('..', 'bin', 'functest_{}_{}{}'.format(
-            implementation.scheme.name,
-            implementation.name,
-            '.exe' if os.name == 'nt' else ''
-        ))],
-        os.path.join('..', 'bin'),
-        env=env,
-    )
-    # Remove files with ASAN library compiled in
-    helpers.make('clean-scheme',
-                 TYPE=implementation.scheme.type,
-                 SCHEME=implementation.scheme.name,
-                 IMPLEMENTATION=implementation.name,
-                 working_dir=os.path.join('..', 'test'))
+    try:
+        helpers.run_subprocess(
+            [os.path.join('..', 'bin', 'functest_{}_{}{}'.format(
+                implementation.scheme.name,
+                implementation.name,
+                '.exe' if os.name == 'nt' else ''
+            ))],
+            os.path.join('..', 'bin'),
+            env=env,
+        )
+    except AssertionError as e:
+        raise e
+    finally:
+        # Remove files with ASAN library compiled in
+        helpers.make('clean-scheme',
+                     TYPE=implementation.scheme.type,
+                     SCHEME=implementation.scheme.name,
+                     IMPLEMENTATION=implementation.name,
+                     working_dir=os.path.join('..', 'test'))
 
 
 if __name__ == '__main__':