diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 9556fb0441..960d8d0bc7 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -75,7 +75,11 @@ def _showwarning(message, category, filename, lineno, file=None, line=None):
         bb.msg.warn(None, s)
 
 warnings.showwarning = _showwarning
-warnings.simplefilter("ignore", DeprecationWarning)
+warnings.filterwarnings("ignore")
+warnings.filterwarnings("default", module="(<string>$|(oe|bb)\.)")
+warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
+warnings.filterwarnings("ignore", category=ImportWarning)
+warnings.filterwarnings("ignore", category=DeprecationWarning, module="<string>$")
 
 #============================================================================#
 # main