diff --git a/jenkins-client-it-docker/jobs/test/builds/1/archive/artifact1.txt b/jenkins-client-it-docker/jobs/test/builds/1/archive/artifact1.txt
new file mode 100644
index 00000000..0097bbb1
--- /dev/null
+++ b/jenkins-client-it-docker/jobs/test/builds/1/archive/artifact1.txt
@@ -0,0 +1 @@
+this is artifact1
\ No newline at end of file
diff --git a/jenkins-client-it-docker/jobs/test/builds/1/archive/sub folder/artifact2.txt b/jenkins-client-it-docker/jobs/test/builds/1/archive/sub folder/artifact2.txt
new file mode 100644
index 00000000..c1fcd1c6
--- /dev/null
+++ b/jenkins-client-it-docker/jobs/test/builds/1/archive/sub folder/artifact2.txt	
@@ -0,0 +1 @@
+this is artifact2 in the "sub folder"
\ No newline at end of file
diff --git a/jenkins-client-it-docker/jobs/test/config.xml b/jenkins-client-it-docker/jobs/test/config.xml
index 885fc61d..1b65249e 100644
--- a/jenkins-client-it-docker/jobs/test/config.xml
+++ b/jenkins-client-it-docker/jobs/test/config.xml
@@ -16,6 +16,15 @@
       <command>echo &quot;test&quot;</command>
     </hudson.tasks.Shell>
   </builders>
-  <publishers/>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>**/*.txt</artifacts>
+      <allowEmptyArchive>false</allowEmptyArchive>
+      <onlyIfSuccessful>true</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
   <buildWrappers/>
 </project>
\ No newline at end of file
diff --git a/jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobDetailsIT.java b/jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobDetailsIT.java
index 1f01d782..0fac3051 100644
--- a/jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobDetailsIT.java
+++ b/jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobDetailsIT.java
@@ -25,6 +25,10 @@ public void beforeMethod() throws IOException {
     @Test
     public void shouldCheckTheBuildCause() throws IOException {
         BuildWithDetails details = job.getFirstBuild().details();
+        assertThat(details.getArtifacts()).isNotNull();
+        assertThat(details.getArtifacts().size()).isEqualTo(2);
+        details.getArtifacts().forEach(a -> assertThat(a.getClient()).isNotNull());
+
         List<BuildCause> causes = details.getCauses();
         assertThat(causes).hasSize(1);
         BuildCause buildCause = causes.get(0);
diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
index 8674e921..ecd8b84c 100644
--- a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
+++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
@@ -10,6 +10,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
+import com.offbytwo.jenkins.client.JenkinsHttpConnection;
 import com.offbytwo.jenkins.helper.BuildConsoleStreamListener;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -154,6 +155,14 @@ public BuildWithDetails(BuildWithDetails details) {
         this.setClient(details.getClient());
     }
 
+    @Override
+    public void setClient(JenkinsHttpConnection client) {
+        super.setClient(client);
+        if (this.artifacts != null) {
+            this.artifacts.stream().forEach(a -> a.setClient(client));
+        }
+    }
+
     public List<Artifact> getArtifacts() {
         return artifacts;
     }