diff --git a/acme/acme/client_test.py b/acme/acme/client_test.py
index a1d42340a..58917f92a 100644
--- a/acme/acme/client_test.py
+++ b/acme/acme/client_test.py
@@ -104,19 +104,22 @@ class ClientTest(unittest.TestCase):
         self.assertEqual(self.regr, self.client.register(self.new_reg))
         # TODO: test POST call arguments
 
-    def test_register_v2(self):
+    def test_register(self):
         directory = messages.Directory({
-            messages.NewAccount: 'https://www.letsencrypt-demo.org/acme/new-account',
+            "new-account": 'https://www.letsencrypt-demo.org/acme/new-account',
         })
         from acme.client import Client
         client = Client(directory=directory, key=KEY, acme_version=2, net=self.net)
-
-        account = messages.NewAccount()
         self.response.status_code = http_client.CREATED
-        self.response.json.return_value = account.to_json()
+        self.response.json.return_value = self.regr.body.to_json()
         self.response.headers['Location'] = self.regr.uri
 
-        self.assertEqual(account, client.register(account))
+        self.regr = messages.RegistrationResource(
+            body=messages.Registration(
+                contact=self.contact, key=KEY.public_key()),
+            uri='https://www.letsencrypt-demo.org/acme/reg/1')
+
+        self.assertEqual(self.regr, client.register(self.regr))
 
     def test_update_registration(self):
         # "Instance of 'Field' has no to_json/update member" bug: