Fix GH-1726 on master

This commit fixes #1726 on master. @enebo merged PR of #1726 into master(d51e4a60a906e6b20e2f1e2fc388428a00265b01). But #1726 regression spec don’t pass on current master. I don't know why merged codes was reverted.

Change the rspec file name is related to #2174.