diff --git a/test/libmpv_test.c b/test/libmpv_test.c
index deda2b18b8..9de0440247 100644
--- a/test/libmpv_test.c
+++ b/test/libmpv_test.c
@@ -15,15 +15,258 @@
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <inttypes.h>
 #include <libmpv/client.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
-int main(void)
+// Stolen from osdep/compiler.h
+#ifdef __GNUC__
+#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format(printf, a1, a2)))
+#define MP_NORETURN __attribute__((noreturn))
+#else
+#define PRINTF_ATTRIBUTE(a1, a2)
+#define MP_NORETURN
+#endif
+
+// Broken crap with __USE_MINGW_ANSI_STDIO
+#if defined(__MINGW32__) && defined(__GNUC__) && !defined(__clang__)
+#undef PRINTF_ATTRIBUTE
+#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (gnu_printf, a1, a2)))
+#endif
+
+// Dummy values for the test.
+static const char *str = "string";
+static int flag = 1;
+static int64_t int_ = 20;
+static double double_ = 1.5;
+
+// Global handle.
+static mpv_handle *ctx;
+
+
+MP_NORETURN PRINTF_ATTRIBUTE(1, 2)
+static void fail(const char *fmt, ...)
 {
-    mpv_handle *handle = mpv_create();
-    if (!handle)
+	if (fmt) {
+		va_list va;
+		va_start(va, fmt);
+		vfprintf(stderr, fmt, va);
+		va_end(va);
+	}
+	mpv_destroy(ctx);
+    exit(1);
+}
+
+static void check_api_error(int status)
+{
+    if (status < 0)
+        fail("mpv API error: %s\n", mpv_error_string(status));
+}
+
+static void check_double(const char *property)
+{
+    double result_double;
+    check_api_error(mpv_get_property(ctx, property, MPV_FORMAT_DOUBLE, &result_double));
+    if (double_ != result_double)
+        fail("Double: expected '%f' but got '%f'!\n", double_, result_double);
+}
+
+static void check_flag(const char *property)
+{
+    int result_flag;
+    check_api_error(mpv_get_property(ctx, property, MPV_FORMAT_FLAG, &result_flag));
+    if (flag != result_flag)
+        fail("Flag: expected '%d' but got '%d'!\n", flag, result_flag);
+}
+
+static void check_int(const char *property)
+{
+    int64_t result_int;
+    check_api_error(mpv_get_property(ctx, property, MPV_FORMAT_INT64, &result_int));
+    if (int_ != result_int)
+        fail("Int: expected '%" PRId64 "' but got '%" PRId64 "'!\n", int_, result_int);
+}
+
+static void check_string(const char *property)
+{
+    char *result_string;
+    check_api_error(mpv_get_property(ctx, property, MPV_FORMAT_STRING, &result_string));
+    if (strcmp(str, result_string) != 0)
+        fail("String: expected '%s' but got '%s'!\n", str, result_string);
+    mpv_free(result_string);
+}
+
+static void check_results(const char *properties[], enum mpv_format formats[])
+{
+    for (int i = 0; properties[i]; i++) {
+        switch (formats[i]) {
+        case MPV_FORMAT_STRING:
+            check_string(properties[i]);
+            break;
+        case MPV_FORMAT_FLAG:
+            check_flag(properties[i]);
+            break;
+        case MPV_FORMAT_INT64:
+            check_int(properties[i]);
+            break;
+        case MPV_FORMAT_DOUBLE:
+            check_double(properties[i]);
+            break;
+        }
+    }
+}
+
+static void set_options_and_properties(const char *options[], const char *properties[],
+                                              enum mpv_format formats[])
+{
+    for (int i = 0; options[i]; i++) {
+        switch (formats[i]) {
+        case MPV_FORMAT_STRING:
+            check_api_error(mpv_set_option(ctx, options[i], formats[i], &str));
+            check_api_error(mpv_set_property(ctx, properties[i], formats[i], &str));
+            break;
+        case MPV_FORMAT_FLAG:
+            check_api_error(mpv_set_option(ctx, options[i], formats[i], &flag));
+            check_api_error(mpv_set_property(ctx, properties[i], formats[i], &flag));
+            break;
+        case MPV_FORMAT_INT64:
+            check_api_error(mpv_set_option(ctx, options[i], formats[i], &int_));
+            check_api_error(mpv_set_property(ctx, properties[i], formats[i], &int_));
+            break;
+        case MPV_FORMAT_DOUBLE:
+            check_api_error(mpv_set_option(ctx, options[i], formats[i], &double_));
+            check_api_error(mpv_set_property(ctx, properties[i], formats[i], &double_));
+            break;
+        }
+    }
+}
+
+static void test_file_loading(char *file)
+{
+    const char *cmd[] = {"loadfile", file, NULL};
+    check_api_error(mpv_command(ctx, cmd));
+    int loaded = 0;
+    int finished = 0;
+    time_t end = time(NULL) + 10;
+    while (time(NULL) < end) {
+        if (finished)
+            break;
+        mpv_event *event = mpv_wait_event(ctx, 0);
+        switch (event->event_id) {
+        case MPV_EVENT_FILE_LOADED:
+            // make sure it loads before exiting
+            loaded = 1;
+            break;
+        case MPV_EVENT_END_FILE:
+            if (loaded)
+                finished = 1;
+            break;
+        }
+    }
+    if (!finished)
+        fail("Unable to load test file!\n");
+}
+
+static void test_lavfi_complex(char *file)
+{
+    const char *cmd[] = {"loadfile", file, NULL};
+    check_api_error(mpv_command(ctx, cmd));
+    int finished = 0;
+    int loaded = 0;
+    time_t end = time(NULL) + 10;
+    while (time(NULL) < end) {
+        if (finished)
+            break;
+        mpv_event *event = mpv_wait_event(ctx, 0);
+        switch (event->event_id) {
+        case MPV_EVENT_FILE_LOADED:
+            // Add file as external and toggle lavfi-complex on.
+            if (!loaded) {
+                check_api_error(mpv_set_property_string(ctx, "external-files", file));
+                const char *add_cmd[] = {"video-add", file, "auto", NULL};
+                check_api_error(mpv_command(ctx, add_cmd));
+                check_api_error(mpv_set_property_string(ctx, "lavfi-complex", "[vid1] [vid2] vstack [vo]"));
+            }
+            loaded = 1;
+            break;
+        case MPV_EVENT_END_FILE:
+            if (loaded)
+                finished = 1;
+            break;
+        }
+    }
+    if (!finished)
+        fail("Lavfi complex failed!\n");
+}
+
+// Ensure that setting options/properties work correctly and
+// have the expected values.
+static void test_options_and_properties(void)
+{
+    // Order matters. string -> flag -> int -> double (repeat)
+    // One for set_option the other for set_property
+    const char *options[] = {
+        "screen-name",
+        "save-position-on-quit",
+        "cursor-autohide",
+        "speed",
+        NULL
+    };
+
+    const char *properties[] = {
+        "fs-screen-name",
+        "shuffle",
+        "sub-pos",
+        "window-scale",
+        NULL
+    };
+
+    // Must match above ordering.
+    enum mpv_format formats[] = {
+        MPV_FORMAT_STRING,
+        MPV_FORMAT_FLAG,
+        MPV_FORMAT_INT64,
+        MPV_FORMAT_DOUBLE,
+    };
+
+    set_options_and_properties(options, properties, formats);
+
+    check_api_error(mpv_initialize(ctx));
+
+    check_results(options, formats);
+    check_results(properties, formats);
+
+    // Ensure the format is still MPV_FORMAT_FLAG for these property types.
+    mpv_node result_node;
+    check_api_error(mpv_get_property(ctx, "idle-active", MPV_FORMAT_NODE, &result_node));
+    if (result_node.format != MPV_FORMAT_FLAG)
+        fail("Node: expected mpv format '%d' but got '%d'!\n", MPV_FORMAT_FLAG, result_node.format);
+
+    // Always should be true.
+    if (result_node.u.flag != 1)
+        fail("Node: expected 1 but got %d'!\n", result_node.u.flag);
+}
+
+int main(int argc, char *argv[])
+{
+    if (argc != 2)
         return 1;
-    if (mpv_initialize(handle))
+
+    ctx = mpv_create();
+    if (!ctx)
         return 1;
-    mpv_destroy(handle);
+
+    // Use tct for all video-related stuff.
+    check_api_error(mpv_set_property_string(ctx, "vo", "tct"));
+
+    test_options_and_properties();
+    test_file_loading(argv[1]);
+    test_lavfi_complex(argv[1]);
+
+    mpv_destroy(ctx);
     return 0;
 }
diff --git a/test/meson.build b/test/meson.build
index 4db93a11b9..06a65cf276 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -100,7 +100,8 @@ test('paths', paths)
 if get_option('libmpv')
     libmpv_test = executable('libmpv-test', 'libmpv_test.c',
                              include_directories: incdir, link_with: libmpv)
-    test('libmpv', libmpv_test)
+    file = join_paths(source_root, 'etc', 'mpv-icon-8bit-16x16.png')
+    test('libmpv', libmpv_test, args: file)
 endif
 
 # Minimum required libavutil version that works with these tests.