diff --git a/test/scenarios/kvm-templates/ucs-school-performance-env1.cfg b/test/scenarios/kvm-templates/ucs-school-performance-env1.cfg
index 2a137943178..586ca31dac5 100644
--- a/test/scenarios/kvm-templates/ucs-school-performance-env1.cfg
+++ b/test/scenarios/kvm-templates/ucs-school-performance-env1.cfg
@@ -11,7 +11,7 @@ kvm_extra_label: ucs-school-performance-env1-[ENV:UCS_VERSION]
 kvm_template: [ENV:KVM_TEMPLATE]
 kvm_ucsversion: [ENV:KVM_UCSVERSION]
 kvm_architecture: amd64
-kvm_memory: 6G
+kvm_memory: 8G
 
 kvm_dhcp: 1
 kvm_interface: eth0
diff --git a/test/utils/utils-school.sh b/test/utils/utils-school.sh
index 50492af3604..e1d8d16a1e1 100644
--- a/test/utils/utils-school.sh
+++ b/test/utils/utils-school.sh
@@ -351,7 +351,7 @@ for school in schools:
         wg.create(lo)
     # add empty classes in big schools
     if len(users) > 2000:
-        for i in range(1, 1501):
+        for i in range(1, 1001):
             sc_data = {"name": f"{school.name}-empty-class{i}", "school": school.name}
             sc = SchoolClass(**sc_data)
             sc.create(lo)