diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2af7c8f..3e7d7fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Create a blank SSH "authorized_keys" file on jail init
 * Many new tests with BATS
 * Check for firewall configuration in bkcld-check
+* Run the test suite on Buster (ext4/btrfs) in addition of Stretch (ext4/btrfs)
 
 ### Changed
 
diff --git a/Vagrantfile b/Vagrantfile
index baf6e21..c544987 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -45,7 +45,9 @@ SCRIPT
 
   nodes = [
     { :version => "stretch", :fs => "btrfs" },
-    { :version => "stretch", :fs => "ext4" }
+    { :version => "stretch", :fs => "ext4" },
+    { :version => "buster", :fs => "btrfs" },
+    { :version => "buster", :fs => "ext4" }
   ]
 
   nodes.each do |i|