diff --git a/Makefile b/Makefile
index 8f1a5ab4..0a068943 100644
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,7 @@ clean:
 run-python-test: $(COMPILED_TESTS)
 	PYENV_VERSION=pypy3.7-7.3.9 . cairo-rs-py-env/bin/activate && \
 	maturin develop && \
-	python3 hints_tests.py && \
-	python3 get_builtins_initial_stack.py && \
+	./run_python_tests.sh && \
 	deactivate
 
 full-test: test run-python-test
diff --git a/run_python_tests.sh b/run_python_tests.sh
new file mode 100755
index 00000000..00a79f73
--- /dev/null
+++ b/run_python_tests.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+echo "Running hint tests"
+python3 tests/hints_tests.py 
+python3 tests/get_builtins_initial_stack.py 
+
+echo "Running prepare_os_context integration tests"
+python3 tests/prepare_os_context.py  
diff --git a/get_builtins_initial_stack.py b/tests/get_builtins_initial_stack.py
similarity index 98%
rename from get_builtins_initial_stack.py
rename to tests/get_builtins_initial_stack.py
index cc8fda70..ad46dc04 100644
--- a/get_builtins_initial_stack.py
+++ b/tests/get_builtins_initial_stack.py
@@ -3,7 +3,7 @@
 def new_runner(program_name: str):
     with open(f"cairo_programs/{program_name}.json") as file:
         return cairo_rs_py.CairoRunner(file.read(), "main", "all", False)
-
+        
 def test_program(program_name: str):
     runner = new_runner(program_name)
     
diff --git a/hints_tests.py b/tests/hints_tests.py
similarity index 100%
rename from hints_tests.py
rename to tests/hints_tests.py
diff --git a/tests/prepare_os_context.py b/tests/prepare_os_context.py
new file mode 100644
index 00000000..a5bb77d0
--- /dev/null
+++ b/tests/prepare_os_context.py
@@ -0,0 +1,34 @@
+import cairo_rs_py
+
+def init_runner(program_name):
+    with open(f"cairo_programs/{program_name}.json") as file:
+        return cairo_rs_py.CairoRunner(file.read(), "main", "small", False)
+
+
+def prepare_os_context_without_builtins(runner):
+    syscall_segment = runner.add_segment()
+    os_context = [syscall_segment]
+    os_context.extend(runner.get_builtins_initial_stack())
+    return os_context
+
+def prepare_os_context_with_builtins(runner):
+    syscall_segment = runner.add_segment()
+    os_context = [syscall_segment]
+    runner.initialize_function_runner()
+    os_context.extend(runner.get_builtins_initial_stack())
+    return os_context
+
+
+if __name__ == "__main__":
+    runner = init_runner("get_builtins_initial_stack")
+    print("initialize no builtin")
+    expected_output = [(0,0)]
+    context = prepare_os_context_without_builtins(runner)
+    assert str(context) == str(expected_output)
+
+    print("initialize builtins")
+    runner = init_runner("get_builtins_initial_stack")
+    context = prepare_os_context_with_builtins(runner)
+    expected_output =  [(0, 0), ('output', [(3, 0)]), ('pedersen', [(4, 0)]), ('range_check', [(5, 0)]), ('bitwise', [(6, 0)]), ('ec_op', [(7, 0)])]
+    assert str(context) == str(expected_output)
+    print("prepare_os_context tests passed")