diff --git a/src/js/_enqueues/lib/quicktags.js b/src/js/_enqueues/lib/quicktags.js
index ffdbfaeef7349..526d654366c68 100644
--- a/src/js/_enqueues/lib/quicktags.js
+++ b/src/js/_enqueues/lib/quicktags.js
@@ -272,7 +272,7 @@ window.edToolbar = function(){};
use = '';
// Set buttons.
- if ( settings.buttons ) {
+ if ( settings.buttons || '' === settings.buttons ) {
use = ','+settings.buttons+',';
}
diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index f9033a776151c..a858587633234 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -98,6 +98,10 @@
+
+
+
diff --git a/tests/qunit/wp-includes/js/quicktags.js b/tests/qunit/wp-includes/js/quicktags.js
new file mode 100644
index 0000000000000..09b48c55e0a26
--- /dev/null
+++ b/tests/qunit/wp-includes/js/quicktags.js
@@ -0,0 +1,71 @@
+/* global QTags, quicktags */
+
+jQuery( function() {
+ var editors, originalButtons, originalDir, buttonsInitDone;
+
+ function createEditor( settings, clock ) {
+ var id = 'quicktags-test-' + editors.length, editor;
+ jQuery( '