diff --git a/vms/vm-under-test/scripts/customize-vm b/vms/vm-under-test/scripts/customize-vm
index 210ed338..9b0cd557 100755
--- a/vms/vm-under-test/scripts/customize-vm
+++ b/vms/vm-under-test/scripts/customize-vm
@@ -25,3 +25,6 @@ systemctl disable irqbalance
 
 dnf --enablerepo=rt install -y tuned-profiles-realtime
 dnf --enablerepo=nfv install -y tuned-profiles-nfv-guest
+
+swapoff -a
+sed -i '/swap/s/^/#/' /etc/fstab
diff --git a/vms/vm-under-test/scripts/first-boot b/vms/vm-under-test/scripts/first-boot
index ea0f4203..676c3880 100755
--- a/vms/vm-under-test/scripts/first-boot
+++ b/vms/vm-under-test/scripts/first-boot
@@ -19,6 +19,8 @@
 
 set -e
 
+systemctl mask "$(systemctl --type swap | grep '.swap' | awk '{print $1}')"
+
 echo isolated_cores=1-2 >> /etc/tuned/realtime-virtual-guest-variables.conf
 echo isolate_managed_irq=Y >> /etc/tuned/realtime-virtual-guest-variables.conf
 tuned-adm profile realtime-virtual-guest