diff --git a/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-3.1.0-foss-2022a.eb b/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-3.1.0-foss-2022a.eb
index 66bc90e3a29..a4a6cdb6e35 100644
--- a/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-3.1.0-foss-2022a.eb
+++ b/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-3.1.0-foss-2022a.eb
@@ -13,12 +13,12 @@ source_urls = ['https://app.box.com/shared/static/']
 sources = [{'download_filename': '2bik75lrs85zt281ydbup2xa7i5594gy.gz', 'filename': SOURCE_TAR_GZ}]
 patches = [
     'BerkeleyGW-3.1.0_tests.patch',
-    'BerkeleyGW-3.0.1_makefile.patch',
+    'BerkeleyGW-3.1.0_makefile.patch',
 ]
 checksums = [
     {'BerkeleyGW-3.1.0.tar.gz': '7e890a5faa5a6bb601aa665c73903b3af30df7bdd13ee09362b69793bbefa6d2'},
     {'BerkeleyGW-3.1.0_tests.patch': 'ef73cb7b69a6aad0da90538ef673e978e159d96e62147a304780b1ec25a4c156'},
-    {'BerkeleyGW-3.0.1_makefile.patch': '56d90dc4e43db379441b6a1802e24f1f1356cd4aca4eb6d8b673f6c7926a7406'},
+    {'BerkeleyGW-3.1.0_makefile.patch': '7a8b4bb593d75cf51ca42f94cd2b0ae5440b80e53e0cd00f183821539bc43fc6'},
 ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-3.1.0_makefile.patch b/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-3.1.0_makefile.patch
new file mode 100644
index 00000000000..f5b9c258b23
--- /dev/null
+++ b/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-3.1.0_makefile.patch
@@ -0,0 +1,24 @@
+* don't rebuild flavors when installing and checking, and check using MPI
+author: Miguel Dias Costa (National University of Singapore)
+--- Makefile.orig	2024-01-04 10:02:31.992454794 +0800
++++ Makefile	2024-01-04 10:02:52.863330557 +0800
+@@ -130,7 +130,7 @@
+ 	cp flavor_cplx.mk flavor.mk
+ 	$(MAKE) all
+ 
+-install: all
++install:
+ ifdef INSTDIR
+ 	mkdir -p $(INSTDIR)/bin
+ 	install bin/*.x $(INSTDIR)/bin/
+@@ -152,8 +152,8 @@
+ 	$(error Error: Please define installation prefix INSTDIR via 'make install INSTDIR='.)
+ endif
+ 
+-check: all
+-	cd testsuite && $(MAKE) check
++check:
++	cd testsuite && $(MAKE) check-parallel
+ 
+ check-save: all
+ 	cd testsuite && $(MAKE) check-save