diff --git a/lib/nova b/lib/nova
index 2357d87ee3..b289ec6d6d 100644
--- a/lib/nova
+++ b/lib/nova
@@ -1085,6 +1085,15 @@ function start_nova_compute {
 # gets its own configuration and own log file.
 local fake_conf="${NOVA_FAKE_CONF}-${i}"
 iniset $fake_conf DEFAULT host "${HOSTNAME}${i}"
+ # Ensure that each fake compute has its own state path so that it
+ # can have its own compute_id file
+ local state_path
+ state_path="$NOVA_STATE_PATH/${HOSTNAME}${i}"
+ COMPUTE_ID=$(uuidgen)
+ sudo mkdir -p "$state_path"
+ iniset $fake_conf DEFAULT state_path "$state_path"
+ # use the generated UUID as the stable compute node UUID
+ echo "$COMPUTE_ID" | sudo tee "$state_path/compute_id"
 run_process "n-cpu-${i}" "$NOVA_BIN_DIR/nova-compute --config-file $NOVA_CPU_CONF --config-file $fake_conf"
 done
 else
diff --git a/lib/nova_plugins/hypervisor-fake b/lib/nova_plugins/hypervisor-fake
index 87ee49fa4b..39cb45ca67 100644
--- a/lib/nova_plugins/hypervisor-fake
+++ b/lib/nova_plugins/hypervisor-fake
@@ -36,7 +36,7 @@ function cleanup_nova_hypervisor {
 
 # configure_nova_hypervisor - Set config files, create data dirs, etc
 function configure_nova_hypervisor {
- iniset $NOVA_CONF DEFAULT compute_driver "fake.FakeDriver"
+ iniset $NOVA_CONF DEFAULT compute_driver "fake.FakeDriverWithoutFakeNodes"
 # Disable arbitrary limits
 iniset $NOVA_CONF quota driver nova.quota.NoopQuotaDriver
 }
</div><div class="naked_ctrl">
<form action="/index.cgi/speech" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/devstack/commit/1cbc615c7dab268570c9a1e8c4f39cf87f4e901a.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/devstack/commit/1cbc615c7dab268570c9a1e8c4f39cf87f4e901a.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech" selected="selected">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>