diff --git a/src/Plugin/DisplayVariant/BlockDisplayVariant.php b/src/Plugin/DisplayVariant/BlockDisplayVariant.php
index 197bf4e..4961070 100644
--- a/src/Plugin/DisplayVariant/BlockDisplayVariant.php
+++ b/src/Plugin/DisplayVariant/BlockDisplayVariant.php
@@ -135,11 +135,8 @@ public function build() {
             '#weight' => $weight++,
             '#configuration' => $block->getConfiguration(),
             '#plugin_id' => $block->getPluginId(),
-            // @todo BlockPluginInterface should extend from
-            //   DerivativeInspectionInterface in
-            //   https://www.drupal.org/node/1875996.
-            '#base_plugin_id' => $block instanceof DerivativeInspectionInterface ? $block->getBasePluginId() : $block->getPluginId(),
-            '#derivative_plugin_id' => $block instanceof DerivativeInspectionInterface ? $block->getDerivativeId() : $block->getPluginId(),
+            '#base_plugin_id' => $block->getBaseId(),
+            '#derivative_plugin_id' => $block->getDerivativeId(),
           );
           $block_render_array['#configuration']['label'] = String::checkPlain($block_render_array['#configuration']['label']);
           $block_render_array['content'] = $block->build();
diff --git a/tests/src/BlockDisplayVariantTest.php b/tests/src/BlockDisplayVariantTest.php
index 1b3f4ac..c3db9d7 100644
--- a/tests/src/BlockDisplayVariantTest.php
+++ b/tests/src/BlockDisplayVariantTest.php
@@ -73,9 +73,15 @@ public function testBuild() {
     $block1->expects($this->once())
       ->method('getConfiguration')
       ->will($this->returnValue(array('label' => 'Block label')));
-    $block1->expects($this->exactly(3))
+    $block1->expects($this->once())
       ->method('getPluginId')
       ->will($this->returnValue('block_plugin_id'));
+    $block1->expects($this->once())
+      ->method('getBaseId')
+      ->will($this->returnValue('block_base_plugin_id'));
+    $block1->expects($this->once())
+      ->method('getDerivativeId')
+      ->will($this->returnValue('block_derivative_plugin_id'));
     $block2 = $this->getMock('Drupal\page_manager\Tests\TestContextAwareBlockPluginInterface');
     $block2->expects($this->once())
       ->method('access')
@@ -124,8 +130,8 @@ public function testBuild() {
             'label' => 'Block label'
           ),
           '#plugin_id' => 'block_plugin_id',
-          '#base_plugin_id' => 'block_plugin_id',
-          '#derivative_plugin_id' => 'block_plugin_id',
+          '#base_plugin_id' => 'block_base_plugin_id',
+          '#derivative_plugin_id' => 'block_derivative_plugin_id',
           'content' => array(
             '#markup' => 'block1_build_value',
           ),