diff --git a/tests/default.nix b/tests/default.nix
index eb0b3909322d..206db700b194 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -24,6 +24,7 @@ in
 
 {
   kde4 = apply (import ./kde4.nix);
+  firefox = apply (import ./firefox.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
   trac = apply (import ./trac.nix);
diff --git a/tests/firefox.nix b/tests/firefox.nix
new file mode 100644
index 000000000000..17bfc3f9e4a5
--- /dev/null
+++ b/tests/firefox.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+
+{
+
+  machine = 
+    { config, pkgs, ... }:
+
+    { services.xserver.enable = true;
+      environment.systemPackages = [ pkgs.icewm pkgs.firefox ];
+    };
+
+  testScript =
+    ''
+      $machine->waitForFile("/tmp/.X11-unix/X0");
+
+      sleep 10;
+
+      $machine->execute("DISPLAY=:0.0 icewm &");
+
+      sleep 10;
+      
+      $machine->execute("DISPLAY=:0.0 HOME=/root firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
+
+      sleep 30;
+
+      $machine->screenshot("screen");
+    '';
+  
+}