diff --git a/autopackage.sh b/autopackage.sh
index 33cd88ccc..1d4a3c4f3 100755
--- a/autopackage.sh
+++ b/autopackage.sh
@@ -28,6 +28,8 @@ ipsec_pv=ipsec-$(date +%Y_%m_%d)
 ipsec_tarball=${ipsec_pv}.tar
 isal_pv=isal-$(date +%Y_%m_%d)
 isal_tarball=${isal_pv}.tar
+ocf_pv=ocf-$(date +%Y_%m_%d)
+ocf_tarball=${ocf_pv}.tar
 
 find . -iname "spdk-*.tar* dpdk-*.tar* ipsec-*.tar* isal-*.tar*" -delete
 git archive HEAD^{tree} --prefix=${spdk_pv}/ -o ${spdk_tarball}
@@ -58,6 +60,13 @@ if [ -d "isa-l" ]; then
 	tar -C "$tmpdir/${spdk_pv}" -xf $isal_tarball
 fi
 
+if [ -d "ocf" ]; then
+	cd ocf
+	git archive HEAD^{tree} --prefix=ocf/ -o ../${ocf_tarball}
+	cd ..
+	tar -C "$tmpdir/${spdk_pv}" -xf $ocf_tarball
+fi
+
 (
 	cd "$tmpdir"/spdk-*
 	# use $config_params to get the right dependency options, but disable coverage and ubsan
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 1e14c9b3d..1bd8fb167 100644
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -94,7 +94,7 @@ if [ $SPDK_TEST_CRYPTO -eq 1 ]; then
 fi
 
 if [ $SPDK_TEST_OCF -eq 1 ]; then
-	config_params+=" --with-ocf=/usr/src/ocf"
+	config_params+=" --with-ocf"
 fi
 
 export UBSAN_OPTIONS='halt_on_error=1:print_stacktrace=1:abort_on_error=1'