diff --git a/test/runtests.jl b/test/runtests.jl
index 148514976253884a6426d6d858a6d7154bf12dc0..6190c003a2d538794ab098ddd9a62e2417ccb3fa 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -23,9 +23,18 @@
 using Test
 using CaosDB
 
-if haskey(ENV, "SHELL")
-    shell_var = ENV["SHELL"]
-else
-    shell_var = "default"
+@testset "CaosDBUnitTests" begin
+    @testset "TestUtility" begin
+        if haskey(ENV, "SHELL")
+            shell_var = ENV["SHELL"]
+        else
+            shell_var = "default"
+        end
+        @test CaosDB.Utility.get_env_var("SHELL", "default") == shell_var
+    end
+    
+    @testset "TestExceptions" begin
+        @test CaosDB.Exceptions.evaluate_return_code(Cint(0)) == nothing
+        @test_throws CaosDB.Exceptions.CaosDBException CaosDB.Exceptions.evaluate_return_code(Cint(14))
+    end
 end
-@test CaosDB.Utility.get_env_var("SHELL", "default") == shell_var