diff --git a/jakarta-mail.spec b/jakarta-mail.spec
index 10c185a..7b09ae0 100644
--- a/jakarta-mail.spec
+++ b/jakarta-mail.spec
@@ -1,18 +1,16 @@
-%global srcname mail
-
 Name:           jakarta-mail
 Version:        1.6.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Jakarta Mail API
 License:        EPL-2.0 or GPLv2 with exceptions
-
 URL:            https://github.com/eclipse-ee4j/mail
-Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
-
 BuildArch:      noarch
 
+Source0:        https://github.com/eclipse-ee4j/mail/archive/%{version}/mail-%{version}.tar.gz
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.sun.activation:jakarta.activation)
+BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
@@ -29,9 +27,8 @@ Obsoletes:      javamail-javadoc  < 1.5.2-16
 The Jakarta Mail API provides a platform-independent and
 protocol-independent framework to build mail and messaging applications.
 
-
 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%setup -n mail-%{version}
 
 # remove unnecessary dependency on parent POM
 %pom_remove_parent
@@ -67,22 +64,22 @@ sed -i "s/\${mail\.osgiversion}/%{version}/g" mailapi/pom.xml
     javamail/javax.mail \
     javax.mail/javax.mail
 
-
 %build
 # skip javadoc build due to https://github.com/fedora-java/xmvn/issues/58
 %mvn_build -j
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE.md NOTICE.md
 %doc README.md
 
-
 %changelog
+* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.5-4
+- Add build-dependency on junit
+- Resolves: rhbz#1976998
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.5-3
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937