diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 0819d004017..8e68ea3f9cb 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -78,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
     # TODO: Resolve the issues with the Mono bindings.
-    broken = monoSupport && (gtkVersion != "2");
+    broken = monoSupport;
   };
 })
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 3b48195d11d..be456cf5944 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl
 , linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin
 , autoreconfHook
+, testers
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -8,7 +9,9 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: let
+  inherit (finalAttrs) version;
+in {
   pname = "bzip2";
   version = "1.0.8";
 
@@ -53,12 +56,15 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/libbz2.so.1.0.* $out/lib/libbz2.so.1.0
   '';
 
+  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
   meta = with lib; {
     description = "High-quality data compression program";
     homepage = "https://www.sourceware.org/bzip2";
     changelog = "https://sourceware.org/git/?p=bzip2.git;a=blob;f=CHANGES;hb=HEAD";
     license = licenses.bsdOriginal;
+    pkgConfigModules = [ "bzip2" ];
     platforms = platforms.all;
     maintainers = with maintainers; [ mic92 ];
   };
-}
+})