diff --git a/core/modules/tour/lib/Drupal/tour/Annotation/Tip.php b/core/modules/tour/lib/Drupal/tour/Annotation/Tip.php
new file mode 100644
index 0000000..d693c17
--- /dev/null
+++ b/core/modules/tour/lib/Drupal/tour/Annotation/Tip.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\tour\Annotation\Tip.
+ */
+
+namespace Drupal\tour\Annotation;
+
+use Drupal\Component\Annotation\PluginID;
+
+/**
+ * Defines a Tip annotation object.
+ *
+ * @Annotation
+ */
+class Tip extends PluginID {
+
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  public $id;
+
+}
diff --git a/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php b/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php
index 1dc1d88..8f6d40c 100644
--- a/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php
+++ b/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php
@@ -7,16 +7,13 @@
 
 namespace Drupal\tour\Plugin\tour\tip;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\tour\Annotation\Tip;
 use Drupal\tour\TipPluginBase;
 
 /**
  * Displays some text as a tip.
  *
- * @Plugin(
- *   id = "text",
- *   module = "tour"
- * )
+ * @Tip("text")
  */
 class TipPluginText extends TipPluginBase {
 
diff --git a/core/modules/tour/lib/Drupal/tour/TipPluginManager.php b/core/modules/tour/lib/Drupal/tour/TipPluginManager.php
index fd8c1c4..ddcc307 100644
--- a/core/modules/tour/lib/Drupal/tour/TipPluginManager.php
+++ b/core/modules/tour/lib/Drupal/tour/TipPluginManager.php
@@ -26,7 +26,8 @@ class TipPluginManager extends PluginManagerBase {
    *   keyed by the corresponding namespace to look for plugin implementations,
    */
   public function __construct(\Traversable $namespaces) {
-    $this->discovery = new AnnotatedClassDiscovery('tour', 'tip', $namespaces);
+    $annotation_namespaces = array('Drupal\tour\Annotation' => $namespaces['Drupal\tour']);
+    $this->discovery = new AnnotatedClassDiscovery('tour', 'tip', $namespaces, $annotation_namespaces, 'Drupal\tour\Annotation\Tip');
     $this->discovery = new CacheDecorator($this->discovery, 'tour');
 
     $this->factory = new DefaultFactory($this->discovery);
diff --git a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php b/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php
index bc12eb4..b03ffbe 100644
--- a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php
+++ b/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php
@@ -7,16 +7,13 @@
 
 namespace Drupal\tour_test\Plugin\tour\tip;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\tour\Annotation\Tip;
 use Drupal\tour\TipPluginBase;
 
 /**
  * Displays an image as a tip.
  *
- * @Plugin(
- *   id = "image",
- *   module = "tour_test"
- * )
+ * @Tip("image")
  */
 class TipPluginImage extends TipPluginBase {
 
