diff --git a/debian/changelog b/debian/changelog
index 252e09d6aeca..e8b1d7a6fc22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+docker.io (19.03.4+dfsg2-2+basicsmokebuster1) UNRELEASED; urgency=medium
+
+  * debian/tests/basic-smoke: stick to 'buster' as debootstrap suite
+    instead of the 'stable' moving target, which changes over stable
+    releases thus might cause problems to debootstrap; e.g., Release
+    signature check and out-of-date script errors. (Closes: #)
+
+ -- Mauricio Faria de Oliveira <mfo@canonical.com>  Fri, 06 Dec 2019 19:13:12 -0300
+
 docker.io (19.03.4+dfsg2-2) unstable; urgency=medium
 
   * Removed unused package from Build-Depends.
diff --git a/debian/tests/basic-smoke b/debian/tests/basic-smoke
index eae62a1f91d3..e70d8080886b 100755
--- a/debian/tests/basic-smoke
+++ b/debian/tests/basic-smoke
@@ -25,7 +25,7 @@ defer "rm -rf '$tempDir'"
 
 debootstrap \
 	--variant=minbase \
-	stable \
+	buster \
 	"$tempDir" \
 	http://httpredir.debian.org/debian