Fix GH-1695 on master

This commit fixes #1695 on master. Change the rspec file name is related to #2174. 

@headius Please also refer to #2011.