diff --git a/src/zmq-contexts.ads b/src/zmq-contexts.ads
index 2796a66..0b7ffb2 100644
--- a/src/zmq-contexts.ads
+++ b/src/zmq-contexts.ads
@@ -36,15 +36,10 @@ package ZMQ.Contexts is
    IO_THREADS_DFLT  : constant := 1;
    MAX_SOCKETS_DFLT : constant := 1024;
 
-   type Context is new Ada.Finalization.Limited_Controlled with private;
+   type Context is tagged limited private;
    type Any_Context is access all Context'Class;
 
 
-   overriding
-   procedure Initialize (This : in out Context);
-
-   overriding
-   procedure Finalize (This : in out Context);
 
    not overriding
    procedure Set_number_of_IO_threads
@@ -82,4 +77,10 @@ private
    type Context is new Ada.Finalization.Limited_Controlled with record
       c : System.Address := System.Null_Address;
    end record;
+   overriding
+   procedure Initialize (This : in out Context);
+
+   overriding
+   procedure Finalize (This : in out Context);
+
 end ZMQ.Contexts;
diff --git a/tests/testcases/zmq-tests-testcases-test_pubsub.adb b/tests/testcases/zmq-tests-testcases-test_pubsub.adb
index 51fda2e..1665860 100644
--- a/tests/testcases/zmq-tests-testcases-test_pubsub.adb
+++ b/tests/testcases/zmq-tests-testcases-test_pubsub.adb
@@ -65,8 +65,6 @@ package body ZMQ.Tests.Testcases.Test_Pubsub is
    begin
       T.Pub.Finalize;
       T.Sub.Finalize;
-      T.Ctx.Finalize;
-      null;
    end Finalize;
    --------------------
    -- Register_Tests --