diff --git a/tests/document_test.rs b/tests/document_test.rs
index f8c9350..df45864 100644
--- a/tests/document_test.rs
+++ b/tests/document_test.rs
@@ -13,9 +13,10 @@ pub static TIMEOUT: Duration = Duration::from_millis(500);
 #[test]
 fn are_errors_produced_for_duplicate_names() {
     let mut mtt = MoreThanText::new();
+    let client = mtt.client();
     let docdef = DocDef::new(Name::english("duplicate"));
-    mtt.create_document(docdef.clone()).unwrap();
-    match mtt.create_document(docdef) {
+    client.create_document(docdef.clone()).unwrap();
+    match client.create_document(docdef) {
         Ok(_) => assert!(false, "should have failed"),
         Err(err) => match err.get_error_ids().back().unwrap() {
             ErrorID::NameAlreadyExists => {}
@@ -27,6 +28,7 @@ fn are_errors_produced_for_duplicate_names() {
 #[test]
 fn does_document_respond_to() {
     let mut mtt = MoreThanText::new();
+    let client = mtt.client();
     let doc_name = random_name();
     let mut requests: Vec<ClientAction> = Vec::new();
     requests.push(Addition::new(doc_name.clone()).into());
@@ -34,9 +36,9 @@ fn does_document_respond_to() {
     requests.push(Query::new(doc_name.clone()).into());
     requests.push(Update::new(doc_name.clone()).into());
     let docdef = DocDef::new(doc_name.clone());
-    mtt.create_document(docdef).unwrap();
+    client.create_document(docdef).unwrap();
     for req in requests.iter() {
-        let result = mtt.records(req.clone()).unwrap();
+        let result = client.records(req.clone()).unwrap();
         assert_eq!(result.len(), 0, "from {:?}", req);
     }
 }
@@ -45,10 +47,11 @@ fn does_document_respond_to() {
 fn does_document_ignore_other_document_requests() {
     let mut test_env = TestMoreThanText::new();
     let mut mtt = test_env.get_morethantext();
+    let client = mtt.client();
     let quiet = Name::english("quiet");
     let alt = Name::english("alt");
-    mtt.create_document(DocDef::new(quiet.clone())).unwrap();
-    mtt.create_document(DocDef::new(alt.clone())).unwrap();
+    client.create_document(DocDef::new(quiet.clone())).unwrap();
+    client.create_document(DocDef::new(alt.clone())).unwrap();
     let paths = vec![Path::new(
         Include::All,
         Include::Just(quiet.clone().into()),
@@ -61,7 +64,7 @@ fn does_document_ignore_other_document_requests() {
     requests.push(Query::new(alt.clone()).into());
     requests.push(Update::new(alt.clone()).into());
     for req in requests.iter() {
-        mtt.records(req.clone()).unwrap();
+        client.records(req.clone()).unwrap();
     }
     match test_env.recv() {
         Ok(msg) => unreachable!("got {:?} should have timed out", msg),