diff --git a/bacillus/ci_pushbuild.sh b/bacillus/ci_pushbuild.sh
index a1e7164..4eba743 100755
--- a/bacillus/ci_pushbuild.sh
+++ b/bacillus/ci_pushbuild.sh
@@ -54,9 +54,11 @@ else
 fi
 
 ############
-stage "Test(S->C)"
+stage "Test(xc S->C)"
 ############
 echo "Testing secure copy from server -> client ..."
+./xc_testfiles.sh
+
 tmpdir=$$
 mkdir -p /tmp/$tmpdir
 cd /tmp/$tmpdir
@@ -76,7 +78,7 @@ else
 fi
 
 ############
-stage "Test(C->S)"
+stage "Test(xc C->S)"
 ############
 echo "TODO ..."
 
@@ -99,7 +101,7 @@ tar -cz --exclude=.git --exclude=cptest -f ${BACILLUS_ARTFDIR}/xs.tgz .
 ############
 stage "Cleanup"
 ############
-# nop
+rm -rf cptest
 
 echo
 echo "--Done--"
diff --git a/cptest.sha1sum b/cptest.sha1sum
index 0440760..1183e23 100644
--- a/cptest.sha1sum
+++ b/cptest.sha1sum
@@ -1,6 +1,6 @@
-306637b5c621892078ebadd9454a78820a000598  cptest/file16KB
-1a118dfff291352eb4aec02c34f4f957669460fc  cptest/file1KB
-f474d5da45890b7cb5b0ae84c8ade5abcb3b4474  cptest/file32KB
-03939175ceac92b9c6464d037a0243e22563c423  cptest/file6B
-da67c7698b25d94c0cc20284ba9d4008cdee201b  cptest/subdir/file32MB
-9da9888265371375b48c224b94a0b3132b7ddc41  cptest/subdir/file64MB
+6010a446cdcf8c1203c2d08998cc69a8c88f77d5  cptest/file16KB
+f086ea96f3718efd78e6791178f967585acb3701  cptest/file1KB
+6061e16c3d3840712d0b8e5268c49b5c2f8137ac  cptest/file32KB
+490af32035bbe737480f06439a02d91a171ac407  cptest/file6B
+e4a8a4ad9678b7265a28c5f0cb5b078e1049ea23  cptest/subdir/file32MB
+82b50550c7d0e0d6ac18d9d0796b6814c3e038bf  cptest/subdir/file64MB
diff --git a/cptest/file16KB b/cptest/file16KB
deleted file mode 100644
index 527be98..0000000
Binary files a/cptest/file16KB and /dev/null differ
diff --git a/cptest/file1KB b/cptest/file1KB
deleted file mode 100644
index d7ef210..0000000
Binary files a/cptest/file1KB and /dev/null differ
diff --git a/cptest/file32KB b/cptest/file32KB
deleted file mode 100644
index c861b09..0000000
Binary files a/cptest/file32KB and /dev/null differ
diff --git a/cptest/file6B b/cptest/file6B
deleted file mode 100644
index 78ed112..0000000
--- a/cptest/file6B
+++ /dev/null
@@ -1 +0,0 @@
-fileB
diff --git a/cptest/subdir/file32MB b/cptest/subdir/file32MB
deleted file mode 100644
index b186671..0000000
Binary files a/cptest/subdir/file32MB and /dev/null differ
diff --git a/cptest/subdir/file64MB b/cptest/subdir/file64MB
deleted file mode 100644
index e1fbf1f..0000000
Binary files a/cptest/subdir/file64MB and /dev/null differ
diff --git a/xc_testfiles.sh b/xc_testfiles.sh
new file mode 100755
index 0000000..9fe5375
--- /dev/null
+++ b/xc_testfiles.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+## setup.sh - create some files for xc copy testing
+dir=cptest
+
+mkdir -p ${dir}/subdir
+dd bs=1024 count=16 if=/dev/urandom of=${dir}/file16KB
+dd bs=1024 count=16 if=/dev/urandom of=${dir}/file1KB
+dd bs=1024 count=16 if=/dev/urandom of=${dir}/file32KB
+dd bs=1024 count=16 if=/dev/urandom of=${dir}/file6B
+dd bs=1048576 count=32 if=/dev/urandom of=${dir}/subdir/file32MB
+dd bs=1048576 count=64 if=/dev/urandom of=${dir}/subdir/file64MB
+
+sha1sum $(find ${dir} -type f | sort) >${dir}.sha1sum