diff --git a/Project.toml b/Project.toml
index 6355850d..0eea8826 100644
--- a/Project.toml
+++ b/Project.toml
@@ -22,16 +22,23 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 ForwardDiffStaticArraysExt = "StaticArrays"
 
 [compat]
+Aqua = "0.8"
 Calculus = "0.5"
 CommonSubexpressions = "0.3"
 DiffResults = "1.1"
 DiffRules = "1.4"
 DiffTests = "0.1"
+InteractiveUtils = "1"
+LinearAlgebra = "1"
 LogExpFunctions = "0.3"
 NaNMath = "1"
 Preferences = "1"
+Printf = "1"
+Random = "1"
+SparseArrays = "1"
 SpecialFunctions = "1, 2"
 StaticArrays = "1.5"
+Test = "1"
 julia = "1.6"
 
 [extras]
diff --git a/test/AquaTest.jl b/test/AquaTest.jl
index d22cf692..8d890b9d 100644
--- a/test/AquaTest.jl
+++ b/test/AquaTest.jl
@@ -2,12 +2,14 @@ using Test
 using ForwardDiff
 using Aqua
 
-@testset "Aqua tests (performance)" begin
+@testset "Aqua tests - unbound_args" begin
     # This tests that we don't accidentally run into
     # https://github.com/JuliaLang/julia/issues/29393
     ua = Aqua.detect_unbound_args_recursively(ForwardDiff)
     @test length(ua) == 6
+end
 
+@testset "Aqua tests - ambiguities" begin
     # See: https://github.com/SciML/OrdinaryDiffEq.jl/issues/1750
     # Test that we're not introducing method ambiguities across deps
     ambs = Aqua.detect_ambiguities(ForwardDiff; recursive = true)
@@ -18,13 +20,8 @@ using Aqua
     @test length(ambs) == 0
 end
 
-@testset "Aqua tests (additional)" begin
-    Aqua.test_undefined_exports(ForwardDiff)
-    Aqua.test_stale_deps(ForwardDiff)
-    Aqua.test_deps_compat(ForwardDiff)
-    Aqua.test_project_extras(ForwardDiff)
-    Aqua.test_project_toml_formatting(ForwardDiff)
-    Aqua.test_piracy(ForwardDiff)
+@testset "Aqua tests - remaining" begin
+    Aqua.test_all(ForwardDiff; ambiguities = false, unbound_args = false)
 end
 
 nothing