diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index afe1a55..1d9d76a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,9 +15,17 @@ SET(LIVE_TESTS
 )
 
 IF(SDL2PP_WITH_MIXER)
-	SET(LIVE_TESTS ${LIVE_TESTS} live_mixer)
+	SET(LIVE_TESTS ${LIVE_TESTS}
+		live_mixer
+	)
 ENDIF(SDL2PP_WITH_MIXER)
 
+IF(SDL2PP_WITH_IMAGE)
+	SET(CLI_TESTS ${CLI_TESTS}
+		test_surface
+	)
+ENDIF(SDL2PP_WITH_IMAGE)
+
 # disable self-move warning: it's deliberately used in tests
 INCLUDE(AppendCXXFlagIfSupported)
 APPEND_CXX_FLAG_IF_SUPPORTED(-Wno-self-move CMAKE_CXX_FLAGS)
diff --git a/tests/test_surface.cc b/tests/test_surface.cc
new file mode 100644
index 0000000..076445a
--- /dev/null
+++ b/tests/test_surface.cc
@@ -0,0 +1,17 @@
+#include <SDL2/SDL_main.h>
+
+#include <SDL2pp/Surface.hh>
+
+#include "testing.h"
+
+using namespace SDL2pp;
+
+BEGIN_TEST(int, char*[])
+	Surface crate(TESTDATA_DIR "/crate.png");
+
+	{
+		EXPECT_EQUAL(crate.GetWidth(), 32);
+		EXPECT_EQUAL(crate.GetHeight(), 32);
+		EXPECT_EQUAL(crate.GetSize(), Point(32, 32));
+	}
+END_TEST()