A method is provided for the treatment of waste streams resulting from the processing of hydrocarbons that contain naphthenic acids, for example desalter brine resulting from the extraction or production of hydrocarbons from an oil sands reservoir. Naphthenic acids can be removed from these streams by removing oil-wet solids from the waste stream prior to conventional waste water processing, and the oil-wet solids can further be independently remediated to reduce naphthenic acid concentration for disposal.