diff --git a/test/Aqua.jl b/test/Aqua.jl
new file mode 100644
index 0000000..6f608e2
--- /dev/null
+++ b/test/Aqua.jl
@@ -0,0 +1,10 @@
+module AquaTests
+
+using Aqua: Aqua
+using AbstractPPL
+
+# For now, we skip ambiguities since they come from interactions
+# with third-party packages rather than issues in AbstractPPL itself
+Aqua.test_all(AbstractPPL; ambiguities=false)
+
+end
diff --git a/test/Project.toml b/test/Project.toml
index 2ca8aaf..e19c50e 100644
--- a/test/Project.toml
+++ b/test/Project.toml
@@ -1,5 +1,6 @@
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 InvertedIndices = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
@@ -10,6 +11,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 Accessors = "0.1"
+Aqua = "0.8"
 Distributions = "0.25"
 Documenter = "0.26.3, 0.27, 1"
 InvertedIndices = "1"
diff --git a/test/runtests.jl b/test/runtests.jl
index b71a812..cb07ee0 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -6,6 +6,7 @@ const GROUP = get(ENV, "GROUP", "All")
 
 @testset "AbstractPPL.jl" begin
     if GROUP == "All" || GROUP == "Tests"
+        include("Aqua.jl")
         include("varname.jl")
         include("abstractprobprog.jl")
         include("hasvalue.jl")