diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index 40d6124b..b5e3cc09 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -6,13 +6,6 @@
 #
 class openstacklib::defaults {
 
-  # TODO(tobias-urdin): Remove this in the T release when we remove
-  # all Puppet 4 related code.
-  if versioncmp($::puppetversion, '5.0.0') < 0 {
-    warning('OpenStack modules support for Puppet 4 is deprecated \
-and will be officially unsupported in the T release')
-  }
-
   if ($::os['family'] == 'Debian') {
     $pyvers = '3'
     $pyver3 = '3'
diff --git a/releasenotes/notes/remove-puppet-4-7edd1536c4078f7a.yaml b/releasenotes/notes/remove-puppet-4-7edd1536c4078f7a.yaml
new file mode 100644
index 00000000..d2c4bdde
--- /dev/null
+++ b/releasenotes/notes/remove-puppet-4-7edd1536c4078f7a.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Puppet OpenStack does not officially support Puppet 4 anymore. Deployments
+    should use Puppet 5 or Puppet 6.