diff --git a/src/fmpz_mod_poly/test/t-sub_series.c b/src/fmpz_mod_poly/test/t-sub_series.c
index 835a760f06..c9f3678171 100644
--- a/src/fmpz_mod_poly/test/t-sub_series.c
+++ b/src/fmpz_mod_poly/test/t-sub_series.c
@@ -147,6 +147,7 @@ main(void)
         fmpz_clear(p);
     }
 
+    fmpz_mod_ctx_clear(ctx);
     FLINT_TEST_CLEANUP(state);
 
     flint_printf("PASS\n");
diff --git a/src/fmpz_poly/test/t-eulerian_polynomial.c b/src/fmpz_poly/test/t-eulerian_polynomial.c
index ada08ce9d4..592ed59ed6 100644
--- a/src/fmpz_poly/test/t-eulerian_polynomial.c
+++ b/src/fmpz_poly/test/t-eulerian_polynomial.c
@@ -87,6 +87,8 @@ int main(void)
     fmpz_clear(sum);
     fmpz_clear(fac);
 
+    FLINT_TEST_CLEANUP(state);
+
     flint_printf("PASS\n");
     return 0;
 }
diff --git a/src/fmpz_poly_factor/test/t-zassenhaus_subset.c b/src/fmpz_poly_factor/test/t-zassenhaus_subset.c
index 6d35bd8ffe..e613435352 100644
--- a/src/fmpz_poly_factor/test/t-zassenhaus_subset.c
+++ b/src/fmpz_poly_factor/test/t-zassenhaus_subset.c
@@ -185,6 +185,8 @@ main(void)
 
     fmpz_clear(f);
 
+    flint_cleanup_master();
+
     flint_printf("PASS\n");
     return 0;
 }
diff --git a/src/nf_elem/test/t-mul_div_fmpq.c b/src/nf_elem/test/t-mul_div_fmpq.c
index 6a581f3383..dfec7ad9f9 100644
--- a/src/nf_elem/test/t-mul_div_fmpq.c
+++ b/src/nf_elem/test/t-mul_div_fmpq.c
@@ -104,6 +104,7 @@ main(void)
     }
 
     flint_randclear(state);
+    flint_cleanup();
 
     return 0;
 }
diff --git a/src/qfb/exponent_grh.c b/src/qfb/exponent_grh.c
index fe19fb6e52..8f7565d5d2 100644
--- a/src/qfb/exponent_grh.c
+++ b/src/qfb/exponent_grh.c
@@ -102,6 +102,7 @@ int qfb_exponent_grh(fmpz_t exponent, fmpz_t n, ulong B1, ulong B2_sqrt)
    fmpz_clear(n2);
    fmpz_clear(exp);
    n_primes_clear(iter);
+   mpfr_clear(lim);
 
    flint_mpz_clear_readonly(mn);
 
diff --git a/src/qfb/test/t-exponent.c b/src/qfb/test/t-exponent.c
index 430434f348..2e015545dd 100644
--- a/src/qfb/test/t-exponent.c
+++ b/src/qfb/test/t-exponent.c
@@ -91,7 +91,8 @@ int main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
+
     printf("PASS\n");
     return 0;
 }
diff --git a/src/qfb/test/t-exponent_element.c b/src/qfb/test/t-exponent_element.c
index da8a781f90..db409e780e 100644
--- a/src/qfb/test/t-exponent_element.c
+++ b/src/qfb/test/t-exponent_element.c
@@ -99,7 +99,8 @@ int main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
+
     printf("PASS\n");
     return 0;
 }
diff --git a/src/qfb/test/t-exponent_grh.c b/src/qfb/test/t-exponent_grh.c
index d31ee7177f..454313845f 100644
--- a/src/qfb/test/t-exponent_grh.c
+++ b/src/qfb/test/t-exponent_grh.c
@@ -91,7 +91,8 @@ int main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
+
     printf("PASS\n");
     return 0;
 }
diff --git a/src/qfb/test/t-nucomp.c b/src/qfb/test/t-nucomp.c
index a3086110a8..37f4361ff1 100644
--- a/src/qfb/test/t-nucomp.c
+++ b/src/qfb/test/t-nucomp.c
@@ -134,7 +134,8 @@ int main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
+
     printf("PASS\n");
     return 0;
 }
diff --git a/src/qfb/test/t-nudupl.c b/src/qfb/test/t-nudupl.c
index 2bd2ab7a32..66d132af60 100644
--- a/src/qfb/test/t-nudupl.c
+++ b/src/qfb/test/t-nudupl.c
@@ -77,7 +77,8 @@ int main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
+
     printf("PASS\n");
     return 0;
 }
diff --git a/src/qfb/test/t-prime_form.c b/src/qfb/test/t-prime_form.c
index a842d98817..43d924fc79 100644
--- a/src/qfb/test/t-prime_form.c
+++ b/src/qfb/test/t-prime_form.c
@@ -83,7 +83,8 @@ int main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
+
     printf("PASS\n");
     return 0;
 }
diff --git a/src/qfb/test/t-reduced_forms.c b/src/qfb/test/t-reduced_forms.c
index f45a37acb1..1bfc23f65d 100644
--- a/src/qfb/test/t-reduced_forms.c
+++ b/src/qfb/test/t-reduced_forms.c
@@ -67,7 +67,8 @@ int main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
+
     printf("PASS\n");
     return 0;
 }