diff -u b/src/Tests/PerBlockTypeSettingsTest.php b/src/Tests/PerBlockTypeSettingsTest.php
--- b/src/Tests/PerBlockTypeSettingsTest.php
+++ b/src/Tests/PerBlockTypeSettingsTest.php
@@ -10,7 +10,6 @@
 namespace Drupal\simplify\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Test simplify per block-type settings.
@@ -139,7 +138,7 @@
    *   Created custom block type.
    */
   protected function createBlockContentType($label, $create_body = FALSE) {
-    $bundle = Vocabulary::create(array(
+    $bundle = entity_create('block_content_type', array(
         'id' => $label,
         'label' => $label,
         'revision' => TRUE,
diff -u b/src/Tests/PerVocabularySettingsTest.php b/src/Tests/PerVocabularySettingsTest.php
--- b/src/Tests/PerVocabularySettingsTest.php
+++ b/src/Tests/PerVocabularySettingsTest.php
@@ -10,7 +10,6 @@
 namespace Drupal\simplify\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Test simplify per vocabulary settings.
@@ -49,7 +48,7 @@
     $this->drupalLogin($admin_user);
 
     // Create a vocabulary.
-    $vocabulary = Vocabulary::create(array(
+    $vocabulary = entity_create('taxonomy_vocabulary', array(
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => 'testing_vocabulary',