diff --git a/src/Magnum/Vk/Test/BufferTest.cpp b/src/Magnum/Vk/Test/BufferTest.cpp
new file mode 100644
index 000000000..4da3a8adb
--- /dev/null
+++ b/src/Magnum/Vk/Test/BufferTest.cpp
@@ -0,0 +1,65 @@
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016
+              Vladimír Vondruš <mosra@centrum.cz>
+    Copyright © 2016 Jonathan Hale <squareys@googlemail.com>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+
+#include <sstream>
+#include <algorithm>
+
+#include "Magnum/Vk/Instance.h"
+#include "Magnum/Vk/Test/AbstractVulkanTester.h"
+
+
+using namespace Corrade;
+
+namespace Magnum { namespace Vk { namespace Test {
+
+struct BufferTest: AbstractVulkanTester {
+    explicit BufferTest();
+
+    void constructCopyMove();
+    void staging();
+};
+
+BufferTest::BufferTest() {
+    addTests({&BufferTest::constructCopyMove,
+              &BufferTest::staging});
+}
+
+void BufferTest::constructCopyMove() {
+    /* Only move-construction allowed */
+    CORRADE_VERIFY(!(std::is_constructible<Buffer, const Buffer&>{}));
+    CORRADE_VERIFY((std::is_constructible<Buffer, Buffer&&>{}));
+    CORRADE_VERIFY(!(std::is_assignable<Buffer, const Buffer&>{}));
+    CORRADE_VERIFY(!(std::is_assignable<Buffer, Buffer&&>{}));
+}
+
+void BufferTest::staging() {
+    MAGNUM_VK_VERIFY_NO_ERROR();
+}
+
+}}}
+
+MAGNUM_VK_TEST_MAIN(Magnum::Vk::Test::BufferTest)
diff --git a/src/Magnum/Vk/Test/CMakeLists.txt b/src/Magnum/Vk/Test/CMakeLists.txt
index 80912b620..bc47f4e8d 100644
--- a/src/Magnum/Vk/Test/CMakeLists.txt
+++ b/src/Magnum/Vk/Test/CMakeLists.txt
@@ -24,11 +24,12 @@
 #   DEALINGS IN THE SOFTWARE.
 #
 
-corrade_add_test(VkContextTest ContextTest.cpp LIBRARIES MagnumVk)
+corrade_add_test(VkInstanceTest InstanceTest.cpp LIBRARIES MagnumVk)
 
 if(BUILD_VK_TESTS)
-    corrade_add_test(ContextVkTest ContextVkTest.cpp LIBRARIES ${VK_TEST_LIBRARIES})
-    corrade_add_test(CommandTest CommandTest.cpp LIBRARIES ${VK_TEST_LIBRARIES})
+    corrade_add_test(VkInstanceVkTest InstanceVkTest.cpp LIBRARIES ${VK_TEST_LIBRARIES})
+    corrade_add_test(VkCommandTest CommandTest.cpp LIBRARIES ${VK_TEST_LIBRARIES})
+    corrade_add_test(VkBufferTest BufferTest.cpp LIBRARIES ${VK_TEST_LIBRARIES})
 
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
                    ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
diff --git a/src/Magnum/Vk/Test/ContextTest.cpp b/src/Magnum/Vk/Test/InstanceTest.cpp
similarity index 100%
rename from src/Magnum/Vk/Test/ContextTest.cpp
rename to src/Magnum/Vk/Test/InstanceTest.cpp
diff --git a/src/Magnum/Vk/Test/ContextVkTest.cpp b/src/Magnum/Vk/Test/InstanceVkTest.cpp
similarity index 94%
rename from src/Magnum/Vk/Test/ContextVkTest.cpp
rename to src/Magnum/Vk/Test/InstanceVkTest.cpp
index ce5cc292c..7e6b29114 100644
--- a/src/Magnum/Vk/Test/ContextVkTest.cpp
+++ b/src/Magnum/Vk/Test/InstanceVkTest.cpp
@@ -29,12 +29,14 @@
 #include <algorithm>
 
 #include "Magnum/Vk/Instance.h"
-#include "AbstractVulkanTester.h"
+#include <Corrade/TestSuite/Tester.h>
 
 
+using namespace Corrade;
+
 namespace Magnum { namespace Vk { namespace Test {
 
-struct InstanceVkTest: AbstractVulkanTester {
+struct InstanceVkTest: TestSuite::Tester {
     explicit InstanceVkTest();
 
     void constructCopyMove();
@@ -73,4 +75,4 @@ void InstanceVkTest::createWithValidation() {
 
 }}}
 
-MAGNUM_VK_TEST_MAIN(Magnum::Vk::Test::InstanceVkTest)
+CORRADE_TEST_MAIN(Magnum::Vk::Test::InstanceVkTest)