diff --git a/tests/Makefile b/tests/Makefile
index 72bf2cd220..bf41d10050 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -119,14 +119,16 @@ tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(
 tests/test-mul64$(EXESUF): tests/test-mul64.o libqemuutil.a
 
 libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o
+libqos-obj-y += tests/libqos/i2c.o
 libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o tests/libqos/fw_cfg-pc.o
 libqos-pc-obj-y += tests/libqos/malloc-pc.o
+libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o
 
 tests/rtc-test$(EXESUF): tests/rtc-test.o
 tests/m48t59-test$(EXESUF): tests/m48t59-test.o
 tests/fdc-test$(EXESUF): tests/fdc-test.o
 tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
-tests/tmp105-test$(EXESUF): tests/tmp105-test.o
+tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
 tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
 tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
 
@@ -137,7 +139,6 @@ QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TA
 check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
 
 qtest-obj-y = tests/libqtest.o libqemuutil.a libqemustub.a
-qtest-obj-y += tests/libi2c.o tests/libi2c-omap.o
 $(check-qtest-y): $(qtest-obj-y)
 
 .PHONY: check-help
diff --git a/tests/libi2c-omap.c b/tests/libqos/i2c-omap.c
similarity index 99%
rename from tests/libi2c-omap.c
rename to tests/libqos/i2c-omap.c
index c52458cbd6..3d4d45d848 100644
--- a/tests/libi2c-omap.c
+++ b/tests/libqos/i2c-omap.c
@@ -6,7 +6,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
-#include "libi2c.h"
+#include "libqos/i2c.h"
 
 #include <glib.h>
 #include <string.h>
diff --git a/tests/libi2c.c b/tests/libqos/i2c.c
similarity index 95%
rename from tests/libi2c.c
rename to tests/libqos/i2c.c
index 13ec85c0cb..da7592f713 100644
--- a/tests/libi2c.c
+++ b/tests/libqos/i2c.c
@@ -6,7 +6,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
-#include "libi2c.h"
+#include "libqos/i2c.h"
 #include "libqtest.h"
 
 void i2c_send(I2CAdapter *i2c, uint8_t addr,
diff --git a/tests/libi2c.h b/tests/libqos/i2c.h
similarity index 100%
rename from tests/libi2c.h
rename to tests/libqos/i2c.h
diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c
index 2869129df3..fecd6dcd70 100644
--- a/tests/tmp105-test.c
+++ b/tests/tmp105-test.c
@@ -7,7 +7,7 @@
  * See the COPYING file in the top-level directory.
  */
 #include "libqtest.h"
-#include "libi2c.h"
+#include "libqos/i2c.h"
 #include "hw/misc/tmp105_regs.h"
 
 #include <glib.h>