diff --git a/ghc-extra.spec b/ghc-extra.spec
index f967a8d..48d6d09 100644
--- a/ghc-extra.spec
+++ b/ghc-extra.spec
@@ -23,11 +23,10 @@ Version:        1.4.10
 Release:        0
 Summary:        Extra functions I use
 License:        BSD-3-Clause
-Group:          System/Libraries
+Group:          Development/Languages/Other
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
 BuildRequires:  ghc-Cabal-devel
-# Begin cabal-rpm deps:
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-process-devel
@@ -38,7 +37,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with tests}
 BuildRequires:  ghc-QuickCheck-devel
 %endif
-# End cabal-rpm deps
 
 %description
 A library of extra functions for the standard Haskell libraries. Most functions
@@ -65,20 +63,14 @@ This package provides the Haskell %{pkg_name} library development files.
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
-
 %build
 %ghc_lib_build
 
-
 %install
 %ghc_lib_install
 
-
 %check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
 
 %post devel
 %ghc_pkg_recache