diff --git a/.github/workflows/zcash-lightwalletd.yml b/.github/workflows/zcash-lightwalletd.yml
index 0964962e9f4..ebd8ce1ffc6 100644
--- a/.github/workflows/zcash-lightwalletd.yml
+++ b/.github/workflows/zcash-lightwalletd.yml
@@ -11,7 +11,7 @@ on:
       # rebuild lightwalletd whenever the related Zebra code changes
       #
       # TODO: this code isn't compiled in this docker image
-      #       rebuild whenever the actual code at zcash/lightwalletd/master changes
+      #       rebuild whenever the actual code at lightwalletd/master changes
       - 'zebra-rpc/**'
       - 'zebrad/tests/acceptance.rs'
       - 'zebrad/src/config.rs'
@@ -50,7 +50,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3.0.2
         with:
-          repository: zcash/lightwalletd
+          repository: adityapk00/lightwalletd
           ref: 'master'
           persist-credentials: false
 
diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs
index 18e99e581c5..628a543e4e4 100644
--- a/zebrad/tests/acceptance.rs
+++ b/zebrad/tests/acceptance.rs
@@ -501,7 +501,9 @@ fn sync_one_checkpoint_mainnet() -> Result<()> {
 /// Test if `zebrad` can sync the first checkpoint on testnet.
 ///
 /// The first checkpoint contains a single genesis block.
-#[test]
+// TODO: disabled because testnet is not currently reliable
+// #[test]
+#[allow(dead_code)]
 fn sync_one_checkpoint_testnet() -> Result<()> {
     sync_until(
         TINY_CHECKPOINT_TEST_HEIGHT,
@@ -523,7 +525,8 @@ fn restart_stop_at_height() -> Result<()> {
     zebra_test::init();
 
     restart_stop_at_height_for_network(Network::Mainnet, TINY_CHECKPOINT_TEST_HEIGHT)?;
-    restart_stop_at_height_for_network(Network::Testnet, TINY_CHECKPOINT_TEST_HEIGHT)?;
+    // TODO: disabled because testnet is not currently reliable
+    // restart_stop_at_height_for_network(Network::Testnet, TINY_CHECKPOINT_TEST_HEIGHT)?;
 
     Ok(())
 }
diff --git a/zebrad/tests/common/launch.rs b/zebrad/tests/common/launch.rs
index 97bdc014f33..fad4315d393 100644
--- a/zebrad/tests/common/launch.rs
+++ b/zebrad/tests/common/launch.rs
@@ -49,9 +49,9 @@ pub const LIGHTWALLETD_UPDATE_TIP_DELAY: Duration = Duration::from_secs(20 * 60)
 
 /// The amount of time we wait for lightwalletd to do a full sync to the tip.
 ///
-/// `lightwalletd` takes about half an hour to fully sync,
+/// `lightwalletd` takes about an hour to fully sync,
 /// and Zebra needs time to activate its mempool.
-pub const LIGHTWALLETD_FULL_SYNC_TIP_DELAY: Duration = Duration::from_secs(45 * 60);
+pub const LIGHTWALLETD_FULL_SYNC_TIP_DELAY: Duration = Duration::from_secs(90 * 60);
 
 /// Extension trait for methods on `tempfile::TempDir` for using it as a test
 /// directory for `zebrad`.