diff --git a/Project.toml b/Project.toml
index da614a0f..33f849ac 100644
--- a/Project.toml
+++ b/Project.toml
@@ -13,17 +13,22 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 FixedPointNumbersStatisticsExt = "Statistics"
 
 [compat]
+Aqua = "0.8"
+Documenter = "0.27, 1"
+Random = "<0.0.1, 1"
 StableRNGs = "1"
 # Update this version specifier when Statistics.jl v1.11.2 is released.
 # https://github.com/JuliaStats/Statistics.jl/issues/165
 Statistics = "< 1.11.2"
+Test = "1"
 julia = "1"
 
 [extras]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Documenter", "StableRNGs", "Statistics", "Test"]
+test = ["Aqua", "Documenter", "StableRNGs", "Statistics", "Test"]
diff --git a/README.md b/README.md
index 0366ace5..35f9e202 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Build Status][action-img]][action-url]
 [![Build Status][pkgeval-img]][pkgeval-url]
 [![coverage][codecov-img]][codecov-url]
+[![Aqua QA](https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg)](https://github.com/JuliaTesting/Aqua.jl)
 
 This library implements fixed-point number types.  A
 [fixed-point number] represents a fractional, or
diff --git a/test/runtests.jl b/test/runtests.jl
index cabb1b17..d037d440 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,10 +1,6 @@
-using FixedPointNumbers, Test
+using FixedPointNumbers, Test, Aqua
 
-if VERSION >= v"1.6.0-DEV.816" # JuliaLang/julia #36962 # FIXME
-    @test isempty(detect_ambiguities(FixedPointNumbers))
-else
-    @test isempty(detect_ambiguities(FixedPointNumbers, Base, Core))
-end
+Aqua.test_all(FixedPointNumbers)
 
 if Sys.ARCH === :x86_64 || Sys.ARCH === :i686
     using Documenter