diff --git a/core/modules/jsonld/jsonld.module b/core/modules/jsonld/jsonld.module
index fdb75bf..43410fd 100644
--- a/core/modules/jsonld/jsonld.module
+++ b/core/modules/jsonld/jsonld.module
@@ -5,6 +5,9 @@
  * Enables entity serialization in JSON-LD.
  */
 
+/**
+ * Implements hook_help().
+ */
 function jsonld_help($path, $args) {
   switch ($path) {
     case 'admin/help#jsonld':
diff --git a/core/modules/jsonld/lib/Drupal/jsonld/DrupalJsonldEntityWrapper.php b/core/modules/jsonld/lib/Drupal/jsonld/DrupalJsonldEntityWrapper.php
index 0e3333d..e8601d7 100644
--- a/core/modules/jsonld/lib/Drupal/jsonld/DrupalJsonldEntityWrapper.php
+++ b/core/modules/jsonld/lib/Drupal/jsonld/DrupalJsonldEntityWrapper.php
@@ -20,10 +20,38 @@ class DrupalJsonldEntityWrapper extends JsonldEntityWrapper {
    * have an intermediary data structure between the entity and the value.
    */
   public function getProperties() {
-    $properties = $this->entity->values;
-    unset($properties['id']);
+    // Properties to skip.
+    $skip = array('id');
+    // Get default language.
+    if ($this->entity->language()->langcode !== 'und') {
+      $defaultLangcode = $this->entity->language();
+    }
+    else {
+      $language = variable_get('language_default');
+      $defaultLangcode = $language['langcode'];
+    }
 
-    return $properties;
+    // Process all the field values from the default translation.
+    foreach ($this->entity as $name => $field) {
+      $definition = $this->entity->getPropertyDefinition($name);
+      // Add non-translatable values.
+      if ($definition['translatable'] == FALSE) {
+        $properties[$name] = $field->getValue();
+      }
+      // Add values in the default language.
+      else {
+        $properties[$name][$defaultLangcode] = $field->getValue();
+      }
+    }
+    // Add translation values.
+    foreach ($this->entity->getTranslationLanguages(FALSE) as $langcode => $language) {
+      foreach ($this->entity->getTranslation($langcode) as $name => $field) {
+        $properties[$name][$langcode] = $field->getValue();
+      }
+    }
+
+    // Only return properties which are not in the $skip array.
+    return array_diff_key($properties, array_fill_keys($skip, ''));
   }
 
 }
diff --git a/core/modules/jsonld/lib/Drupal/jsonld/Tests/DrupalJsonldNormalizerTest.php b/core/modules/jsonld/lib/Drupal/jsonld/Tests/DrupalJsonldNormalizerTest.php
index 6a1b510..08e3844 100644
--- a/core/modules/jsonld/lib/Drupal/jsonld/Tests/DrupalJsonldNormalizerTest.php
+++ b/core/modules/jsonld/lib/Drupal/jsonld/Tests/DrupalJsonldNormalizerTest.php
@@ -44,7 +44,7 @@ public function testSupportsNormalization() {
     $function = 'DrupalJsonldNormalizer::supportsNormlization';
     $supportedFormat = 'drupal_jsonld';
     $unsupportedFormat = 'jsonld';
-    $supportedEntity = entity_create('entity_test', array());
+    $supportedEntity = entity_create('jsonld_test', array());
     $unsupportedEntity = new ConfigEntityTest();
 
     // Supported entity, supported format.
@@ -59,41 +59,74 @@ public function testSupportsNormalization() {
    * Tests the normalize function.
    */
   public function testNormalize() {
+    // Create a German entity.
     $values = array(
+      'langcode' => 'de',
       'name' => $this->randomName(),
+      'user_id' => $GLOBALS['user']->uid,
       'field_test_text' => array(
         'value' => $this->randomName(),
         'format' => 'full_html',
       ),
     );
 
-    $entity = entity_create('entity_test', $values);
+    $langSpecificValues = array(
+      'name' => $this->randomName(),
+    );
+
+    $entity = entity_create('jsonld_test', $values);
     $entity->save();
+    // Add an English value for name property.
+    $entity->getTranslation('en')->set('name', array(0 => array('value' => $langSpecificValues['name'])));
 
     $expectedArray = array(
       '@id' => $this->getEntityId($entity),
+      'uuid' => array(
+        array(
+          'value' => $entity->uuid(),
+        ),
+      ),
+      'user_id' => array(
+        'de' => array(
+          array(
+            'value' => 1,
+          ),
+        ),
+      ),
       'name' => array(
-        LANGUAGE_NOT_SPECIFIED => array(
+        'de' => array(
           array(
             'value' => $values['name'],
           ),
         ),
-      ),
-      'field_test_text' => array(
-        LANGUAGE_NOT_SPECIFIED => array(
+        'en' => array(
           array(
-            'value' => $values['field_test_text']['value'],
-            'format' => $values['field_test_text']['format'],
+            'value' => $langSpecificValues['name'],
           ),
         ),
       ),
+      'field_test_text' => array(
+        array(
+          'value' => $values['field_test_text']['value'],
+          'format' => $values['field_test_text']['format'],
+        ),
+      ),
     );
 
     $normalized = $this->normalizer->normalize($entity);
-    // Remove extraneous array elements and test that the normalized array
-    // matches the expected normalized array.
-    $normalized = $this->prepareNormalizedArray($normalized, $values);
-    $this->assertEqual($normalized, $expectedArray, "DrupalJsonldNormalizer creates expected normalized array.");
+    // Test ordering. The @context and @id properties should always be first.
+    $keys = array_keys($normalized);
+    $this->assertEqual($keys[0], '@id', '@id and @context attributes placed correctly.');
+    // Test @id value.
+    $this->assertEqual($normalized['@id'], $expectedArray['@id'], '@id uses correct value.');
+    // Test non-translatable field.
+    $this->assertEqual($normalized['uuid'], $expectedArray['uuid'], 'Non-translatable fields are nested correctly.');
+    // Test single-language translatable.
+    $this->assertEqual($normalized['user_id'], $expectedArray['user_id'], 'Translatable field with single language value is nested correctly.');
+    // Test multi-language translatable.
+    $this->assertEqual($normalized['name'], $expectedArray['name'], 'Translatable field with multiple language values is nested correctly.');
+    // Test multi-property untranslatable field.
+    $this->assertEqual($normalized['field_test_text'], $expectedArray['field_test_text'], 'Field with properties is nested correctly.');
   }
 
 }
diff --git a/core/modules/jsonld/lib/Drupal/jsonld/Tests/JsonldNormalizerTest.php b/core/modules/jsonld/lib/Drupal/jsonld/Tests/JsonldNormalizerTest.php
index ed44e77..6d3a2fc 100644
--- a/core/modules/jsonld/lib/Drupal/jsonld/Tests/JsonldNormalizerTest.php
+++ b/core/modules/jsonld/lib/Drupal/jsonld/Tests/JsonldNormalizerTest.php
@@ -44,7 +44,7 @@ public function testSupportsNormalization() {
     $function = 'JsonldNormalizer::supportsNormlization';
     $supportedFormat = 'jsonld';
     $unsupportedFormat = 'drupal_jsonld';
-    $supportedEntity = entity_create('entity_test', array());
+    $supportedEntity = entity_create('jsonld_test', array());
     $unsupportedEntity = new ConfigEntityTest();
 
     // Supported entity, supported format.
@@ -55,30 +55,4 @@ public function testSupportsNormalization() {
     $this->assertFalse($this->normalizer->supportsNormalization($unsupportedEntity, $supportedFormat), "$function returns FALSE for unsupported entity type.");
   }
 
-  /**
-   * Tests the normalize function.
-   */
-  public function testNormalize() {
-    $values = array(
-      'name' => $this->randomName(),
-      'field_test_text' => array(
-        'value' => $this->randomName(),
-        'format' => 'full_html',
-      ),
-    );
-
-    $entity = entity_create('entity_test', $values);
-    $entity->save();
-
-    $expectedArray = array(
-      '@id' => $this->getEntityId($entity),
-    );
-
-    $normalized = $this->normalizer->normalize($entity);
-    // Remove extraneous array elements and test that the normalized array
-    // matches the expected normalized array.
-    $normalized = $this->prepareNormalizedArray($normalized, $values);
-    $this->assertEqual($normalized, $expectedArray, "JsonldNormalizer creates expected normalized array.");
-  }
-
 }
diff --git a/core/modules/jsonld/lib/Drupal/jsonld/Tests/JsonldNormalizerTestBase.php b/core/modules/jsonld/lib/Drupal/jsonld/Tests/JsonldNormalizerTestBase.php
index 8807514..dd3ea0d 100644
--- a/core/modules/jsonld/lib/Drupal/jsonld/Tests/JsonldNormalizerTestBase.php
+++ b/core/modules/jsonld/lib/Drupal/jsonld/Tests/JsonldNormalizerTestBase.php
@@ -19,7 +19,7 @@
    *
    * @var array
    */
-  public static $modules = array('entity_test');
+  public static $modules = array('language', 'jsonld_test');
 
   /**
    * Get the Entity ID.
@@ -36,24 +36,4 @@ protected function getEntityId($entity) {
     return $base_url . '/' . $uriInfo['path'];
   }
 
-  /**
-   * Prepare the array returned by normalize().
-   *
-   * Entity API and other modules add fields to the entity when it is saved,
-   * such as UUID and langcode. Don't test the functionality of those other
-   * modules here, remove extraneous fields from the array.
-   *
-   * @param array $normalized
-   *   Normalized array.
-   * @param array $values
-   *   The original values that the entity was instantiated with.
-   *
-   * @return array
-   *   Returns the array with extraneous fields removed.
-   */
-  protected function prepareNormalizedArray($normalized, $values) {
-    // Implemented JSON-LD syntax tokens.
-    $jsonldKeys = array('@id');
-    return array_intersect_key($normalized, array_merge($values, array_fill_keys($jsonldKeys, ' ')));
-  }
 }
diff --git a/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.info b/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.info
new file mode 100644
index 0000000..7436c09
--- /dev/null
+++ b/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.info
@@ -0,0 +1,6 @@
+name = JSON-LD test module
+description = Provides entity types for testing JSON-LD.
+package = Testing
+core = 8.x
+dependencies[] = field
+hidden = TRUE
diff --git a/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.install b/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.install
new file mode 100644
index 0000000..9496d0e
--- /dev/null
+++ b/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.install
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the jsonld_test module.
+ */
+
+/**
+ * Implements hook_install().
+ */
+function jsonld_test_install() {
+  // Auto-create a field for testing.
+  $field = array(
+    'field_name' => 'field_test_text',
+    'type' => 'text',
+    'cardinality' => 1,
+    'translatable' => FALSE,
+  );
+  field_create_field($field);
+
+  $instance = array(
+    'entity_type' => 'jsonld_test',
+    'field_name' => 'field_test_text',
+    'bundle' => 'jsonld_test',
+    'label' => 'Test text-field',
+    'widget' => array(
+      'type' => 'text_textfield',
+      'weight' => 0,
+    ),
+  );
+  field_create_instance($instance);
+}
+
+/**
+ * Implements hook_schema().
+ */
+function jsonld_test_schema() {
+  $schema['jsonld_test'] = array(
+    'description' => 'Stores jsonld_test items.',
+    'fields' => array(
+      'id' => array(
+        'type' => 'serial',
+        'not null' => TRUE,
+        'description' => 'Primary Key: Unique entity-test item ID.',
+      ),
+      'uuid' => array(
+        'description' => 'Unique Key: Universally unique identifier for this entity.',
+        'type' => 'varchar',
+        'length' => 128,
+        'not null' => FALSE,
+      ),
+      'langcode' => array(
+        'description' => 'The {language}.langcode of the original variant of this test entity.',
+        'type' => 'varchar',
+        'length' => 12,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+      'uuid' => array('uuid'),
+    ),
+  );
+  $schema['jsonld_test_property_data'] = array(
+    'description' => 'Stores jsonld_test item properties.',
+    'fields' => array(
+      'id' => array(
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'description' => 'The {jsonld_test}.id of the test entity.',
+      ),
+      'langcode' => array(
+        'description' => 'The {language}.langcode of this variant of this test entity.',
+        'type' => 'varchar',
+        'length' => 12,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'default_langcode' => array(
+        'description' => 'Boolean indicating whether the current variant is in the original entity language.',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 1,
+      ),
+      'name' => array(
+        'description' => 'The name of the test entity.',
+        'type' => 'varchar',
+        'length' => 32,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'user_id' => array(
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => FALSE,
+        'default' => NULL,
+        'description' => "The {users}.uid of the associated user.",
+      ),
+    ),
+    'indexes' => array(
+      'user_id' => array('user_id'),
+    ),
+    'foreign keys' => array(
+      'user_id' => array('users' => 'uid'),
+      'id' => array('jsonld_test' => 'id'),
+    ),
+    'primary key' => array('id', 'langcode'),
+  );
+  return $schema;
+}
diff --git a/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.module b/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.module
new file mode 100644
index 0000000..7f9997b
--- /dev/null
+++ b/core/modules/jsonld/tests/modules/jsonld_test/jsonld_test.module
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Test module for the entity API providing an entity type for testing.
+ */
+
+/**
+ * Implements hook_entity_info().
+ */
+function jsonld_test_entity_info() {
+  $items['jsonld_test'] = array(
+    'label' => t('Test entity'),
+    'entity class' => 'Drupal\jsonld_test\JsonldTest',
+    'controller class' => 'Drupal\jsonld_test\JsonldTestStorageController',
+    'base table' => 'jsonld_test',
+    'data table' => 'jsonld_test_property_data',
+    'fieldable' => TRUE,
+    'entity keys' => array(
+      'id' => 'id',
+      'uuid' => 'uuid',
+    ),
+  );
+  return $items;
+}
diff --git a/core/modules/jsonld/tests/modules/jsonld_test/lib/Drupal/jsonld_test/JsonldTest.php b/core/modules/jsonld/tests/modules/jsonld_test/lib/Drupal/jsonld_test/JsonldTest.php
new file mode 100644
index 0000000..3155b8a
--- /dev/null
+++ b/core/modules/jsonld/tests/modules/jsonld_test/lib/Drupal/jsonld_test/JsonldTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\jsonld_test\JsonldTest.
+ */
+
+namespace Drupal\jsonld_test;
+
+use Drupal\Core\Entity\EntityNG;
+
+/**
+ * Defines the test entity class.
+ */
+class JsonldTest extends EntityNG {
+
+  /**
+   * The entity ID.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $id;
+
+  /**
+   * The entity UUID.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $uuid;
+
+  /**
+   * The name of the test entity.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $name;
+
+  /**
+   * The associated user.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $user_id;
+
+  /**
+   * Overrides Entity::__construct().
+   */
+  public function __construct(array $values, $entity_type) {
+    parent::__construct($values, $entity_type);
+
+    // We unset all defined properties, so magic getters apply.
+    unset($this->id);
+    unset($this->langcode);
+    unset($this->uuid);
+    unset($this->name);
+    unset($this->user_id);
+  }
+}
diff --git a/core/modules/jsonld/tests/modules/jsonld_test/lib/Drupal/jsonld_test/JsonldTestStorageController.php b/core/modules/jsonld/tests/modules/jsonld_test/lib/Drupal/jsonld_test/JsonldTestStorageController.php
new file mode 100644
index 0000000..016ca69
--- /dev/null
+++ b/core/modules/jsonld/tests/modules/jsonld_test/lib/Drupal/jsonld_test/JsonldTestStorageController.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\jsonld_test\JsonldTestStorageController.
+ */
+
+namespace Drupal\jsonld_test;
+
+use Drupal\Core\Entity\DatabaseStorageControllerNG;
+
+/**
+ * Defines the controller class for the test entity.
+ *
+ * This extends the Drupal\Core\Entity\DatabaseStorageController class, adding
+ * required special handling for test entities.
+ */
+class JsonldTestStorageController extends DatabaseStorageControllerNG {
+
+  /**
+   * Implements \Drupal\Core\Entity\DataBaseStorageControllerNG::baseFieldDefinitions().
+   */
+  public function baseFieldDefinitions() {
+    $fields['id'] = array(
+      'label' => t('ID'),
+      'description' => t('The ID of the test entity.'),
+      'type' => 'integer_field',
+      'read-only' => TRUE,
+    );
+    $fields['uuid'] = array(
+      'label' => t('UUID'),
+      'description' => t('The UUID of the test entity.'),
+      'type' => 'string_field',
+    );
+    $fields['langcode'] = array(
+      'label' => t('Language code'),
+      'description' => t('The language code of the test entity.'),
+      'type' => 'language_field',
+    );
+    $fields['name'] = array(
+      'label' => t('Name'),
+      'description' => t('The name of the test entity.'),
+      'type' => 'string_field',
+      'translatable' => TRUE,
+    );
+    $fields['user_id'] = array(
+      'label' => t('User ID'),
+      'description' => t('The ID of the associated user.'),
+      'type' => 'entityreference_field',
+      'settings' => array('entity type' => 'user'),
+      'translatable' => TRUE,
+    );
+    return $fields;
+  }
+}