diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4bfd6ea..e135999 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,12 +15,13 @@ jobs:
         os:
           - ubuntu-latest
         otp:
+          - "29"
           - "28"
           - "27"
           - "26"
           - "25"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - run: make
       - run: make unit_tests
  
diff --git a/Makefile b/Makefile
index 0ff4c2d..b2af0f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PROJECT=ibrowse
 PLT_APPS=erts kernel stdlib ssl crypto public_key
-TEST_ERLC_OPTS=-pa ../ibrowse/ebin
+TEST_ERLC_OPTS=-pa ebin
 
 include erlang.mk
 
diff --git a/src/ibrowse.erl b/src/ibrowse.erl
index f0ea1dc..804fcad 100644
--- a/src/ibrowse.erl
+++ b/src/ibrowse.erl
@@ -54,6 +54,9 @@
 
 -module(ibrowse).
 -behaviour(gen_server).
+
+-compile(nowarn_deprecated_catch).
+
 %%--------------------------------------------------------------------
 %% Include files
 %%--------------------------------------------------------------------
diff --git a/src/ibrowse_http_client.erl b/src/ibrowse_http_client.erl
index 82fc62e..621aba9 100644
--- a/src/ibrowse_http_client.erl
+++ b/src/ibrowse_http_client.erl
@@ -7,6 +7,9 @@
 %%%-------------------------------------------------------------------
 -module(ibrowse_http_client).
 -behaviour(gen_server).
+
+-compile(nowarn_deprecated_catch).
+
 %%--------------------------------------------------------------------
 %% Include files
 %%--------------------------------------------------------------------
diff --git a/src/ibrowse_lb.erl b/src/ibrowse_lb.erl
index 894d8ad..44fc7c2 100644
--- a/src/ibrowse_lb.erl
+++ b/src/ibrowse_lb.erl
@@ -8,6 +8,9 @@
 -module(ibrowse_lb).
 -author(chandru).
 -behaviour(gen_server).
+
+-compile(nowarn_deprecated_catch).
+
 %%--------------------------------------------------------------------
 %% Include files
 %%--------------------------------------------------------------------
diff --git a/src/ibrowse_lib.erl b/src/ibrowse_lib.erl
index 889e996..68af889 100644
--- a/src/ibrowse_lib.erl
+++ b/src/ibrowse_lib.erl
@@ -10,6 +10,8 @@
 -compile(export_all).
 -endif.
 
+-compile(nowarn_deprecated_catch).
+
 -include("ibrowse.hrl").
 
 -ifdef(EUNIT).
diff --git a/test/Makefile b/test/Makefile
index 50a292c..34c580d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,4 @@
-IBROWSE_EBIN_PATH=../../ibrowse/ebin
+IBROWSE_EBIN_PATH=../ebin
 
 compile:
 	@erl -pa $(IBROWSE_EBIN_PATH) -make
diff --git a/test/ibrowse_load_test.erl b/test/ibrowse_load_test.erl
index dc4813a..6b6fbe2 100644
--- a/test/ibrowse_load_test.erl
+++ b/test/ibrowse_load_test.erl
@@ -1,5 +1,8 @@
 -module(ibrowse_load_test).
 %%-compile(export_all).
+
+-compile(nowarn_deprecated_catch).
+
 -export([
          start/3,
          query_state/0,
diff --git a/test/ibrowse_test.erl b/test/ibrowse_test.erl
index 44f0ca5..0411fd9 100644
--- a/test/ibrowse_test.erl
+++ b/test/ibrowse_test.erl
@@ -48,7 +48,9 @@
          socks5_auth_fail/0
 	]).
 
--include_lib("ibrowse/include/ibrowse.hrl").
+-include("../include/ibrowse.hrl").
+
+-compile(nowarn_deprecated_catch).
 
 %%------------------------------------------------------------------------------
 %% Unit Tests
diff --git a/test/ibrowse_test_server.erl b/test/ibrowse_test_server.erl
index 7a5bb01..2faed2a 100644
--- a/test/ibrowse_test_server.erl
+++ b/test/ibrowse_test_server.erl
@@ -4,6 +4,9 @@
 %%% Created : 17 Oct 2010 by Chandrashekhar Mullaparthi <chandrashekhar.mullaparthi@t-mobile.co.uk>
 
 -module(ibrowse_test_server).
+
+-compile(nowarn_deprecated_catch).
+
 -export([
          start_server/0,
          start_server/2,