diff --git a/qla2x00t-32gbit/extract-qla2xxx-orig b/qla2x00t-32gbit/extract-qla2xxx-orig
index 676450cbb..ac9d5f0b4 100755
--- a/qla2x00t-32gbit/extract-qla2xxx-orig
+++ b/qla2x00t-32gbit/extract-qla2xxx-orig
@@ -15,7 +15,7 @@ fi
 
 mkdir -p qla2xxx-orig
 cd qla2xxx-orig || exit $?
-extract_kernel_tree "${kernel_version}"
+download_and_extract_kernel_tree "${kernel_version}"
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
 mkdir -p "${kernel_version}"
diff --git a/qla2x00t/extract-qla2xxx-orig b/qla2x00t/extract-qla2xxx-orig
index 676450cbb..ac9d5f0b4 100755
--- a/qla2x00t/extract-qla2xxx-orig
+++ b/qla2x00t/extract-qla2xxx-orig
@@ -15,7 +15,7 @@ fi
 
 mkdir -p qla2xxx-orig
 cd qla2xxx-orig || exit $?
-extract_kernel_tree "${kernel_version}"
+download_and_extract_kernel_tree "${kernel_version}"
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
 mkdir -p "${kernel_version}"
diff --git a/scripts/generate-patched-kernel b/scripts/generate-patched-kernel
index 1f0cee235..a42990bcc 100755
--- a/scripts/generate-patched-kernel
+++ b/scripts/generate-patched-kernel
@@ -42,9 +42,7 @@ target="linux-$1"
 kernel_version="$(kernel_version "$1")"
 patchlevel="$(patchlevel "$1")"
 
-download_kernel "$1" || exit $?
-
-extract_kernel_tree "$1" || exit $?
+download_and_extract_kernel_tree "$1" || exit $?
 
 cd "${target}" || exit $?
 
diff --git a/scripts/kernel-functions b/scripts/kernel-functions
index 59f675f68..388e1a6ef 100644
--- a/scripts/kernel-functions
+++ b/scripts/kernel-functions
@@ -421,3 +421,6 @@ EOF
   rmdir "${tmpdir}"
 }
 
+function download_and_extract_kernel_tree {
+    download_kernel "$1" && extract_kernel_tree "$1"
+}
diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests
index fd562212a..127dcc93a 100755
--- a/scripts/run-regression-tests
+++ b/scripts/run-regression-tests
@@ -652,14 +652,10 @@ do
   patchdir="patchdir-${kv}"
   k="${kv}"
 
-  if ! download_kernel "$k"; then
-    echo "Downloading kernel version $k failed"
-    continue
-  fi
   generate_kernel_patch "$k" "${generate_kernel_patch_options}" || continue
   (
       cd "${outputdir}" &&
-	  extract_kernel_tree "$k" &&
+	  download_and_extract_kernel_tree "$k" &&
 	  cd "linux-$k/include/linux" &&
 	  if [ ! -e compiler-gcc6.h ]; then
 	      for f in compiler-gcc5.h compiler-gcc4.h; do