diff --git a/arenadata/README.md b/arenadata/README.md
index 40ae250c..7860f605 100644
--- a/arenadata/README.md
+++ b/arenadata/README.md
@@ -16,24 +16,14 @@ docker run --rm -it -e DISKQUOTA_OS=rhel7 \
        hub.adsw.io/library/gpdb6_regress:latest diskquota_src/concourse/scripts/entry.sh build
 ```
 
-3. Run tests.
-Change <PATH_TO_DISKQUOTA_SRC> and <PATH_TO_CMAKE_INSTALL_SCRIPT> to the appropriate paths on your local machine.
-
+3. Run regression and upgrade tests.
+Change <PATH_TO_DISKQUOTA_SRC>, <PATH_TO_ARCHIVE_WITH_OLD_VERSIONS> and <PATH_TO_CMAKE_INSTALL_SCRIPT> to the appropriate paths on your local machine.
+<PATH_TO_ARCHIVE_WITH_OLD_VERSIONS> must be a path to tar-archive with all versions of diskquota (without the last).
 ```
 docker run --rm -it --sysctl 'kernel.sem=500 1024000 200 4096' \
        -v /tmp/diskquota_artifacts:/home/gpadmin/bin_diskquota \
        -v <PATH_TO_DISKQUOTA_SRC>:/home/gpadmin/diskquota_src \
        -v <PATH_TO_CMAKE_INSTALL_SCRIPT>:/home/gpadmin/bin_cmake/cmake-3.20.0-linux-x86_64.sh \
+       -v <PATH_TO_ARCHIVE_WITH_OLD_VERSIONS>://home/gpadmin/diskquota_old_versions.tar \
        hub.adsw.io/library/gpdb6_regress:latest diskquota_src/concourse/scripts/entry.sh test
 ```
-
-4. Run upgrade test.
-Change <PATH_TO_DISKQUOTA_SRC> and <PATH_TO_CMAKE_INSTALL_SCRIPT> to the appropriate paths on your local machine.
-```
-sudo docker run --rm -it -e DISKQUOTA_OS=rhel7 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
-       --sysctl 'kernel.sem=500 1024000 200 4096' \
-       -v /tmp/diskquota_artifacts:/home/gpadmin/bin_diskquota \
-       -v <PATH_TO_DISKQUOTA_SRC>:/home/gpadmin/diskquota_src \
-       -v <PATH_TO_CMAKE_INSTALL_SCRIPT>:/home/gpadmin/bin_cmake/cmake-3.20.0-linux-x86_64.sh \
-       hub.adsw.io/library/gpdb6_regress:latest diskquota_src/concourse/scripts/upgrade_test_diskquota.sh
-```
diff --git a/concourse/scripts/test_diskquota.sh b/concourse/scripts/test_diskquota.sh
index 245196ff..76633b3d 100755
--- a/concourse/scripts/test_diskquota.sh
+++ b/concourse/scripts/test_diskquota.sh
@@ -38,6 +38,9 @@ function _main() {
         activate_standby
         time cmake --build . --target installcheck
     fi
+
+    tar -xf /home/gpadmin/diskquota_old_versions.tar --directory=${GPHOME}/lib/postgresql
+    time cmake --build . --target upgradecheck
     popd
 }
 
diff --git a/concourse/scripts/upgrade_test_diskquota.sh b/concourse/scripts/upgrade_test_diskquota.sh
deleted file mode 100755
index 49f4cb80..00000000
--- a/concourse/scripts/upgrade_test_diskquota.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Install cmake
-cd bin_cmake/
-./cmake-3.20.0-linux-x86_64.sh --skip-license --exclude-subdir
-export PATH="/home/gpadmin/bin_cmake/bin:$PATH"
-cmake --version
-cd ..
-
-# Build and start GPDB
-source gpdb_src/concourse/scripts/common.bash
-install_and_configure_gpdb
-gpdb_src/concourse/scripts/setup_gpadmin_user.bash
-make_cluster
-source /usr/local/greenplum-db-devel/greenplum_path.sh;
-source gpdb_src/gpAux/gpdemo/gpdemo-env.sh;
-
-# Build diskquota-1.0.3 (last tag 1.0.3_arenadata2)
-cp -r diskquota_src/ diskquota_src_tmp
-cd diskquota_src_tmp
-git checkout -- ./
-git checkout 1.0.3_arenadata2
-git clean -xf
-make
-make install
-cd ..
-rm -rf diskquota_src_tmp
-
-# Build test version of diskquota
-cd diskquota_src/
-rm -rf build
-mkdir build
-cd build
-cmake ..
-make install
-
-# Add permissions
-chown gpadmin:gpadmin -R /usr/local/greenplum-db-devel/
-chown gpadmin:gpadmin -R /home/gpadmin/
-
-# Run tests
-# To make fly debug easier
-echo "source /usr/local/greenplum-db-devel/greenplum_path.sh" >> /home/gpadmin/.bashrc
-su gpadmin -c \
-    "source /home/gpadmin/.bashrc && \
-    make upgradecheck"