diff --git a/doc/iscsi.md b/doc/iscsi.md
index 7a2cc8cf0..0ddfff5d3 100644
--- a/doc/iscsi.md
+++ b/doc/iscsi.md
@@ -241,6 +241,16 @@ Packages can be found in `vpp/build-root/` directory.
 For more in depth instructions please see Building section in
 [VPP documentation](https://wiki.fd.io/view/VPP/Pulling,_Building,_Running,_Hacking_and_Pushing_VPP_Code#Building)
 
+*Please note: VPP 18.01.1 does not support OpenSSL 1.1. It is suggested to install a compatibility package
+for compilation time.*
+~~~
+sudo dnf install -y --allowerasing compat-openssl10-devel
+~~~
+*Then reinstall latest OpenSSL devel package:*
+~~~
+sudo dnf install -y --allowerasing openssl-devel
+~~~
+
 ## 2. Installing VPP {#vpp_install}
 
 Packages can be installed from distribution repository or built in previous step.
diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh
index a284b68ef..83c8f3213 100755
--- a/test/common/config/vm_setup.sh
+++ b/test/common/config/vm_setup.sh
@@ -155,6 +155,32 @@ make -j${jobs}
 sudo make install
 cd ~
 
+# Vector packet processing (VPP) is installed for use with iSCSI tests.
+git clone https://gerrit.fd.io/r/vpp
+cd vpp
+git checkout v18.01.1
+# VPP 18.01.1 does not support OpenSSL 1.1.
+# For compilation, a compatibility package is used temporarily.
+sudo dnf install -y --allowerasing compat-openssl10-devel
+# Installing required dependencies for building VPP
+yes | make install-dep
+
+make pkg-rpm -j${jobs}
+# Reinstall latest OpenSSL devel package.
+sudo dnf install -y --allowerasing openssl-devel
+cd build-root
+sudo dnf install -y \
+		./vpp-lib-18.01.1-release.x86_64.rpm \
+		./vpp-devel-18.01.1-release.x86_64.rpm \
+		./vpp-18.01.1-release.x86_64.rpm
+# Since hugepage configuration is done via spdk/scripts/setup.sh,
+# this default config is not needed.
+#
+# NOTE: Parameters kernel.shmmax and vm.max_map_count are set to
+# very low count and cause issues with hugepage total sizes above 1GB.
+sudo rm -f /etc/sysctl.d/80-vpp.conf
+cd ~
+
 # We currently don't make any changes to the libiscsi repository for our tests, but it is possible that we will need
 # to later. Cloning from git is just future proofing the machines.
 git clone https://github.com/sahlberg/libiscsi