diff --git a/core/lib/Drupal/Component/Uuid/Uuid.php b/core/lib/Drupal/Component/Uuid/Uuid.php
index 68a73d1..3ea6efd 100644
--- a/core/lib/Drupal/Component/Uuid/Uuid.php
+++ b/core/lib/Drupal/Component/Uuid/Uuid.php
@@ -20,14 +20,19 @@ class Uuid {
    *
    * @var Drupal\Component\Uuid\UuidInterface
    */
-  protected $plugin;
+  static protected $plugin;
+
+  /**
+   * Holds the current UUID instance.
+   */
+  protected $instance;
 
   /**
    * Instantiates the correct UUID object.
    */
   public function __construct() {
     $class = $this->determinePlugin();
-    $this->plugin = new $class();
+    $this->instance = new $class();
   }
 
   /**
@@ -36,7 +41,7 @@ class Uuid {
    * @see Drupal\Component\Uuid\UuidInterface::generate()
    */
   public function generate() {
-    return $this->plugin->generate();
+    return $this->instance->generate();
   }
 
   /**
@@ -64,24 +69,25 @@ class Uuid {
    * @return string
    *  The class name for the optimal UUID generator.
    */
-  protected function determinePlugin() {
-    static $plugin;
-    if (!empty($plugin)) {
-      return $plugin;
+  public function determinePlugin() {
+    if (!empty(self::$plugin)) {
+      return self::$plugin;
     }
 
-    $plugin = 'Drupal\Component\Uuid\Php';
-
     // Debian/Ubuntu uses the (broken) OSSP extension as their UUID
     // implementation. The OSSP implementation is not compatible with the
     // PECL functions.
     if (function_exists('uuid_create') && !function_exists('uuid_make')) {
-      $plugin = 'Drupal\Component\Uuid\Pecl';
+      self::$plugin = 'Drupal\Component\Uuid\Pecl';
     }
     // Try to use the COM implementation for Windows users.
     elseif (function_exists('com_create_guid')) {
-      $plugin = 'Drupal\Component\Uuid\Com';
+      self::$plugin = 'Drupal\Component\Uuid\Com';
+    }
+    // Use the default PHP implementation.
+    else {
+      self::$plugin = 'Drupal\Component\Uuid\Php';
     }
-    return $plugin;
+    return self::$plugin;
   }
 }
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 0e42214..b6166ff 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1,6 +1,7 @@
 <?php
 
 use Drupal\Core\Database\Database;
+use Drupal\Component\Uuid\Uuid;
 
 /**
  * @file
@@ -55,6 +56,12 @@ function system_requirements($phase) {
     'value' => $software,
   );
 
+  $uuid = new Uuid();
+  $requirements['uuid'] = array(
+    'title' => $t('UUID plugin implementation'),
+    'value' => $uuid->determinePlugin()
+  );
+
   // Test PHP version and show link to phpinfo() if it's available
   $phpversion = phpversion();
   if (function_exists('phpinfo')) {