diff --git a/etc/init.d/noosfero b/etc/init.d/noosfero
index a400439..9abc2d7 100755
--- a/etc/init.d/noosfero
+++ b/etc/init.d/noosfero
@@ -43,7 +43,7 @@ if [ -z "$NOOSFERO_DIR" ] || [ -z "$NOOSFERO_USER" ]; then
 fi
 
 ######################
-FERRET_PID_FILE=$NOOSFERO_DIR/tmp/pids/ferret.production.pid
+SOLR_PID_FILE=$NOOSFERO_DIR/tmp/pids/solr.production.pid
 
 main_script() {
   cd $NOOSFERO_DIR
@@ -90,8 +90,8 @@ do_setup() {
 
 do_start() {
 
-  # FIXME should not test for ferret only
-  if [ -e $FERRET_PID_FILE ]; then
+  # FIXME should not test for solr only
+  if [ -e $SOLR_PID_FILE ]; then
     echo 'noosfero already running, cannot start.'
     exit 2
   fi
@@ -104,8 +104,8 @@ do_start() {
 
 do_stop() {
 
-  # FIXME should not test for ferret only
-  if [ ! -e $FERRET_PID_FILE ]; then
+  # FIXME should not test for solr only
+  if [ ! -e $SOLR_PID_FILE ]; then
     echo 'noosfero not running, cannot stop'
     exit 2
   fi
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index da02d4a..cbbc7c1 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -7,6 +7,9 @@ else
 end
 
 task :test do
+  ENV['RAILS_ENV'] = 'test'
+  Rake::Task['solr:stop'].invoke
+  Rake::Task['solr:start'].invoke
   errors = %w(test:units test:functionals test:integration cucumber selenium).collect do |task|
     begin
       Rake::Task[task].invoke
@@ -15,6 +18,7 @@ task :test do
       task
     end
   end.compact
+  Rake::Task['solr:stop'].invoke
   abort "Errors running #{errors.to_sentence}!" if errors.any?
 end
 
diff --git a/script/development b/script/development
index ce33bd9..a80bfad 100755
--- a/script/development
+++ b/script/development
@@ -1,13 +1,17 @@
 #!/bin/sh
 
+export RAILS_ENV=development
+
 stop() {
   ./script/delayed_job stop
   ./script/feed-updater stop
+  rake -s solr:stop
 }
 
 start() {
   ./script/feed-updater start
   ./script/delayed_job start
+  rake -s solr:start
   trap stop INT TERM
   ./script/server $@
 }
diff --git a/script/ferret_server b/script/ferret_server
deleted file mode 100755
index f5dbf3a..0000000
--- a/script/ferret_server
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  require File.join(File.dirname(__FILE__), '../vendor/plugins/acts_as_ferret/lib/server_manager')
-rescue LoadError
-  # try the gem
-  require 'rubygems'
-  gem 'acts_as_ferret'
-  require 'server_manager'
-end
diff --git a/script/production b/script/production
index f5f85c3..9c3d766 100755
--- a/script/production
+++ b/script/production
@@ -22,7 +22,7 @@ do_start() {
   fi
 
   clear_cache
-  ./script/ferret_server -e $RAILS_ENV start
+  rake -s solr:start
   environments_loop
   mongrel_rails cluster::start
 }
@@ -31,7 +31,7 @@ do_stop() {
   mongrel_rails cluster::stop
   ./script/delayed_job stop
   ./script/feed-updater stop
-  ./script/ferret_server -e $RAILS_ENV stop
+  rake -s solr:stop
 }
 
 environments_loop() {
--
libgit2 0.21.2