diff --git a/tests/integration.rs b/tests/integration.rs
new file mode 100644
index 0000000..9df9e65
--- /dev/null
+++ b/tests/integration.rs
@@ -0,0 +1,8 @@
+// mod event_property_parser {
+//   include!("integration/event_property_parser.rs")
+// }
+// mod util;
+// mod misc;
+mod integration_tests;
+
+// use util::*;
\ No newline at end of file
diff --git a/tests/integration/event_property_parser.rs b/tests/integration_tests/event_property_parser.rs
similarity index 100%
rename from tests/integration/event_property_parser.rs
rename to tests/integration_tests/event_property_parser.rs
diff --git a/tests/integration/misc.rs b/tests/integration_tests/misc.rs
similarity index 100%
rename from tests/integration/misc.rs
rename to tests/integration_tests/misc.rs
diff --git a/tests/integration/mod.rs b/tests/integration_tests/mod.rs
similarity index 100%
rename from tests/integration/mod.rs
rename to tests/integration_tests/mod.rs
diff --git a/tests/integration/util.rs b/tests/integration_tests/util.rs
similarity index 100%
rename from tests/integration/util.rs
rename to tests/integration_tests/util.rs
diff --git a/tests/mock_socket.rs b/tests/mock_socket.rs
new file mode 100644
index 0000000..2fac2b4
--- /dev/null
+++ b/tests/mock_socket.rs
@@ -0,0 +1 @@
+mod mock_socket_tests;
\ No newline at end of file
diff --git a/tests/events.rs b/tests/mock_socket_tests/events.rs
similarity index 100%
rename from tests/events.rs
rename to tests/mock_socket_tests/events.rs
diff --git a/tests/get_property.rs b/tests/mock_socket_tests/get_property.rs
similarity index 100%
rename from tests/get_property.rs
rename to tests/mock_socket_tests/get_property.rs
diff --git a/tests/mock_socket_tests/mod.rs b/tests/mock_socket_tests/mod.rs
new file mode 100644
index 0000000..c50d4ee
--- /dev/null
+++ b/tests/mock_socket_tests/mod.rs
@@ -0,0 +1,3 @@
+mod events;
+mod get_property;
+mod set_property;
\ No newline at end of file
diff --git a/tests/set_property.rs b/tests/mock_socket_tests/set_property.rs
similarity index 100%
rename from tests/set_property.rs
rename to tests/mock_socket_tests/set_property.rs
diff --git a/tests/mod.rs b/tests/mod.rs
deleted file mode 100644
index 605134b..0000000
--- a/tests/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod integration;
\ No newline at end of file