diff --git a/nixos/tests/hadoop/hbase.nix b/nixos/tests/hadoop/hbase.nix
index efc85c869bf9..f6eb1f7e759a 100644
--- a/nixos/tests/hadoop/hbase.nix
+++ b/nixos/tests/hadoop/hbase.nix
@@ -116,6 +116,9 @@ import ../make-test-python.nix (
       zookeeper.wait_for_unit("zookeeper")
       zookeeper.wait_for_open_port(2181)
 
+      # wait for HDFS cluster to be RW
+      datanode.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait")
+
       # wait for HBase to start up
       master.wait_for_unit("hbase-master")
       regionserver.wait_for_unit("hbase-regionserver")
diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index 5d924252d1e9..6e9f3be1d362 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -51,13 +51,13 @@ in
     tests.standalone = nixosTests.hbase_2_4;
   };
   hbase_2_5 = common {
-    version = "2.5.10";
-    hash = "sha256-uYc5IZGQdLOm5gAEyyGtJtcgf+GxADEEuxjixZbG3Qs=";
+    version = "2.5.11";
+    hash = "sha256-W3o8J+aY2bQoiu1Lr1n5EQWDVoS1OwWTNIUAU03a5Es=";
     tests.standalone = nixosTests.hbase_2_5;
   };
   hbase_2_6 = common {
-    version = "2.6.1";
-    hash = "sha256-dubu/4Ilk82NtNEcKt8uLbcH8n81EncxOvkZOwk2kVA=";
+    version = "2.6.2";
+    hash = "sha256-X/mjmTAx9anh2U/Xlfuf+O4AO5BXDkdsY69tPddEpYM=";
     tests.standalone = nixosTests.hbase2;
   };
   hbase_3_0 = common {