diff --git a/tests/LDContextTest.php b/tests/LDContextTest.php
index 40186459..5e9950be 100644
--- a/tests/LDContextTest.php
+++ b/tests/LDContextTest.php
@@ -140,6 +140,12 @@ public function testBuilderSetBuiltInAttributeByNameTypeChecking()
         self::assertFalse($b->trySet('anonymous', null));
         self::assertFalse($b->trySet('anonymous', 3));
         self::assertTrue($b->build()->isAnonymous());
+
+        $b->set('custom-attribute', null);
+        $b->set('custom-attribute', 3);
+        self::assertTrue($b->trySet('custom-attribute', null));
+        self::assertTrue($b->trySet('custom-attribute', 3));
+        self::assertEquals(['custom-attribute'], $b->build()->getCustomAttributeNames());
     }
 
     public function testGetBuiltInAttributeByName()
@@ -172,6 +178,17 @@ public function testPrivateAttributes()
         );
     }
 
+    public function testPrivateEmptyAttributes()
+    {
+        self::assertNull(LDContext::create('a')->getPrivateAttributes());
+
+        $c = LDContext::builder('a')->private()->build();
+        self::assertEquals(
+            null,
+            $c->getPrivateAttributes()
+        );
+    }
+
     public function testCreateMulti()
     {
         $c1 = LDContext::create('a', 'kind1');