diff -Nru dkms-2.2.0.3/debian/changelog dkms-2.2.0.3/debian/changelog
--- dkms-2.2.0.3/debian/changelog	2015-08-27 10:32:53.000000000 +0000
+++ dkms-2.2.0.3/debian/changelog	2015-09-23 14:21:33.000000000 +0000
@@ -1,3 +1,9 @@
+dkms (2.2.0.3-1.1ubuntu5.14.04.3) trusty; urgency=low
+
+  * d/s/autopkgtest: only collect logs if there are any.  (LP: #1498896)
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Wed, 23 Sep 2015 15:21:08 +0100
+
 dkms (2.2.0.3-1.1ubuntu5.14.04.2) trusty; urgency=medium
 
   * Backport dkms-autopkgtest helper script, so that we can run DKMS tests for
diff -Nru dkms-2.2.0.3/debian/scripts/dkms-autopkgtest dkms-2.2.0.3/debian/scripts/dkms-autopkgtest
--- dkms-2.2.0.3/debian/scripts/dkms-autopkgtest	2015-08-27 10:31:09.000000000 +0000
+++ dkms-2.2.0.3/debian/scripts/dkms-autopkgtest	2015-09-23 14:22:55.000000000 +0000
@@ -11,8 +11,11 @@
     export DEBIAN_FRONTEND=noninteractive
     RC=0
     apt-get install -yq $pkg </dev/null || RC=$?
+
     # collect build logs as artifacts
-    (cd /var/lib/dkms; find -name "make.log" -print0 | xargs -0 tar c) > "$ADT_ARTIFACTS/$pkg-make-logs.tar"
+    if [ -d /var/lib/dkms ]; then
+        (cd /var/lib/dkms; find -name "make.log" -print0 | xargs -0 tar c) > "$ADT_ARTIFACTS/$pkg-make-logs.tar"
+    fi
 
     if [ "$RC" -ne 0 ]; then
         echo "E: Package $pkg failed to install" >&2