diff --git a/tests/lib/test_appliance.py b/tests/lib/test_appliance.py
index b6f956db..5bf9d5af 100644
--- a/tests/lib/test_appliance.py
+++ b/tests/lib/test_appliance.py
@@ -1,5 +1,6 @@
 
 import sys, os, os.path, types, traceback, pprint
+import warnings
 
 DATA = 'tests/data'
 
@@ -123,7 +124,7 @@ def run(collections, args=None):
     for function in test_functions:
         if include_functions and function.__name__ not in include_functions:
             continue
-        if function.unittest:
+        if function.unittest and function.unittest is not True:
             for base, exts in test_filenames:
                 if include_filenames and base not in include_filenames:
                     continue
diff --git a/tests/lib/test_dump_load.py b/tests/lib/test_dump_load.py
new file mode 100644
index 00000000..1aa1d1c6
--- /dev/null
+++ b/tests/lib/test_dump_load.py
@@ -0,0 +1,19 @@
+import yaml
+
+def test_dump(verbose=False):
+    assert yaml.dump(['foo'])
+test_dump.unittest = True
+
+def test_load(verbose=False):
+    assert yaml.load("- foo\n")
+test_load.unittest = True
+
+def test_load_safeloader(verbose=False):
+    assert yaml.load("- foo\n", Loader=yaml.SafeLoader)
+test_load_safeloader.unittest = True
+
+if __name__ == '__main__':
+    import sys, test_load
+    sys.modules['test_load'] = sys.modules['__main__']
+    import test_appliance
+    test_appliance.run(globals())
diff --git a/tests/lib/test_yaml.py b/tests/lib/test_yaml.py
index 7b3d8f9d..a5c10a38 100644
--- a/tests/lib/test_yaml.py
+++ b/tests/lib/test_yaml.py
@@ -1,4 +1,5 @@
 
+from test_dump_load import *
 from test_mark import *
 from test_reader import *
 from test_canonical import *