NixOS · Sep 26, 2019
diff --git a/doc/manual/hacking.xml b/doc/manual/hacking.xml
@@ -49,25 +49,8 @@ linkend="sec-deploying-to-ec2"/>.)  To run a specific test, run
 <literal>python2 tests.py
 <replaceable>test-name</replaceable></literal>, e.g.
 
-To run all tests in <filename>./tests/functional/test_encrypted_links.py</filename>
-
-<screen>
-$ python2 tests.py tests.functional.test_encrypted_links
-</screen>
-
-To run only one test in <filename>tests/functional/test_encrypted_links.py</filename>
-
-<screen>
-$ python2 tests.py tests.functional.test_encrypted_links:TestEncryptedLinks.test_deploy
-</screen>
-
 To filter on which backends you want to run functional tests against, you can
 filter on one or more tags.
-To run e.g. only the virtualbox tests, run:
-
-<screen>
-$ python2 tests.py tests.functional -A vbox
-</screen>
 
 
 There are also a few NixOS VM tests. These can be run as follows:

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
@@ -26,9 +26,4 @@ $ nix-env -i nixops
 
 </orderedlist>
 
-<!--
-<para>FIXME: VirtualBox configuration (vboxnet0 host-only networking
-interface).</para>
--->
-
 </chapter>
diff --git a/maintainers/build-virtualbox-image.sh b/maintainers/build-virtualbox-image.sh
diff --git a/nix/options.nix b/nix/options.nix
@@ -27,17 +27,7 @@ in
       type = types.str;
       description = ''
         This option specifies the type of the environment in which the
-        machine is to be deployed by NixOps.  Currently, it can have
-        the following values. <literal>"none"</literal> means
-        deploying to a pre-existing physical or virtual NixOS machine,
-        reachable via SSH under the hostname or IP address specified
-        in <option>deployment.targetHost</option>.
-        <literal>"ec2"</literal> means that a virtual machine should
-        be instantiated in an Amazon EC2-compatible cloud environment
-        (see <option>deployment.ec2.*</option>).
-        <literal>"virtualbox"</literal> causes a VirtualBox VM to be
-        created on your machine.  (This requires VirtualBox to be
-        configured on your system.)
+        machine is to be deployed by NixOps.
       '';
     };
 

diff --git a/tests/functional/encrypted-links.nix b/tests/functional/encrypted-links.nix
diff --git a/tests/functional/single_machine_test.py b/tests/functional/single_machine_test.py
@@ -16,13 +16,6 @@ def setup(self):
         super(SingleMachineTest,self).setup()
         self.depl.nix_exprs = [ logical_spec ]
 
-    @attr("vbox")
-    def test_vbox(self):
-        self.depl.nix_exprs = self.depl.nix_exprs + [
-            ('%s/single_machine_vbox_base.nix' % (parent_dir))
-        ]
-        self.run_check()
-
     @attr("ec2")
     def test_ec2(self):
         self.depl.nix_exprs = self.depl.nix_exprs + [

diff --git a/tests/functional/single_machine_vbox_base.nix b/tests/functional/single_machine_vbox_base.nix
diff --git a/tests/functional/test_encrypted_links.py b/tests/functional/test_encrypted_links.py