diff --git a/includes/common.inc b/includes/common.inc
index 477ecc0..b83f612 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -4756,6 +4756,13 @@ function drupal_get_library($module, $name = NULL) {
         // Add default elements to allow for easier processing.
         $module_libraries[$key] += array('dependencies' => array(), 'js' => array(), 'css' => array());
         foreach ($module_libraries[$key]['js'] as $file => $options) {
+          if (is_scalar($options)) {
+            // The JavaScript or CSS file has been specified in shorthand
+            // format, without an array of options. In this case $options is the
+            // filename.
+            $file = $options;
+            $options = array();
+          }
           $module_libraries[$key]['js'][$file]['version'] = $module_libraries[$key]['version'];
         }
       }
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index f6e03b0..d4c3def 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -1494,6 +1494,11 @@ class JavaScriptTestCase extends DrupalWebTestCase {
     $styles = drupal_get_css();
     $this->assertTrue(strpos($scripts, 'misc/farbtastic/farbtastic.js'), 'JavaScript of library was added to the page.');
     $this->assertTrue(strpos($styles, 'misc/farbtastic/farbtastic.css'), 'Stylesheet of library was added to the page.');
+
+    $result = drupal_add_library('common_test', 'shorthand.plugin');
+    $path = drupal_get_path('module', 'common_test') . '/js/shorthand.js';
+    $scripts = drupal_get_js();
+    $this->assertTrue(strpos($scripts, $path), 'JavaScript specified in hook_library_info() using shorthand format (without any options) was added to the page.');
   }
 
   /**
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module
index 674a494..06298b7 100644
--- a/modules/simpletest/tests/common_test.module
+++ b/modules/simpletest/tests/common_test.module
@@ -248,6 +248,21 @@ function common_test_library() {
       'misc/farbtastic/farbtastic.css' => array(),
     ),
   );
+  // Nominate a library using the shorthand format, where no options are given,
+  // just the file name.
+  $libraries['shorthand.plugin'] = array(
+    'title' => 'Shorthand Plugin',
+    'website' => 'http://www.example.com/',
+    'version' => '0.8.3.37',
+    'js' => array(
+      // Here we attach the JavaScript file using the shorthand format, only
+      // the file name is given, no options.
+      drupal_get_path('module', 'common_test') . '/js/shorthand.js',
+    ),
+    'dependencies' => array(
+      array('system', 'jquery'),
+    ),
+  );
   return $libraries;
 }
 
diff --git a/modules/simpletest/tests/js/shorthand.js b/modules/simpletest/tests/js/shorthand.js
new file mode 100644
index 0000000..27d7525
--- /dev/null
+++ b/modules/simpletest/tests/js/shorthand.js
@@ -0,0 +1,9 @@
+/**
+ * JavaScript file for the 'Shorthand' plugin.
+ *
+ * This file is intentionally blank. It is used to test that nominating
+ * JavaScript (and CSS) files in the shorthand format using hook_library_info().
+ *
+ * @see common_test_library_info()
+ * @see Drupal/system/Tests/Common/JavaScriptTest::testLibraryRender()
+ */
\ No newline at end of file