Index: test/unit/asset_test.rb
===================================================================
--- test/unit/asset_test.rb	(revision 34)
+++ test/unit/asset_test.rb	(revision 36)
@@ -2,32 +2,41 @@

 class AssetTest < Test::Unit::TestCase
   fixtures :sites, :assets, :tags, :taggings
-
+
   def test_should_upload_and_create_asset_records
+    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+
     assert_difference sites(:first).assets, :count do
-      assert_difference Asset, :count, 3 do # asset + 2 thumbnails
+      assert_difference Asset, :count, asset_count do
         process_upload
-        asset = Asset.find(:first, :conditions => 'id > 7', :order => 'created_at')
-        assert_equal 2, asset.thumbnails_count
+
+        if Object.const_defined?(:Magick)
+          asset = Asset.find(:first, :conditions => 'id > 7', :order => 'created_at')
+          assert_equal 2, asset.thumbnails_count
+        end
       end
     end
   end
-
+
   def test_should_upload_file
     process_upload
     now = Time.now.utc
     assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, 'logo.png')
-    assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_thumb.png')
-    assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_tiny.png')
-  end
+    if Object.const_defined?(:Magick)
+      assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_thumb.png')
+      assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_tiny.png')
+    end
+  end

   def test_should_upload_file_in_multi_sites_mode
     Site.multi_sites_enabled = true
     process_upload
     now = Time.now.utc
     assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo.png')
-    assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_thumb.png')
-    assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_tiny.png')
+    if Object.const_defined?(:Magick)
+      assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_thumb.png')
+      assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_tiny.png')
+    end
   ensure
     Site.multi_sites_enabled = false
   end
Index: test/functional/admin/assets_controller_test.rb
===================================================================
--- test/functional/admin/assets_controller_test.rb	(revision 34)
+++ test/functional/admin/assets_controller_test.rb	(revision 36)
@@ -19,10 +19,12 @@
     assert_response :success
     assert_equal 7, assigns(:count_by_conditions)
   end
-
+
   def test_should_upload_and_create_asset_records
+    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+
     assert_difference sites(:first).assets, :count do
-      assert_difference Asset, :count, 3 do # asset + 2 thumbnails
+      assert_difference Asset, :count, asset_count do
         process_upload
         assert_redirected_to asset_path
       end
Index: test/functional/admin/articles_controller_test.rb
===================================================================
--- test/functional/admin/articles_controller_test.rb	(revision 34)
+++ test/functional/admin/articles_controller_test.rb	(revision 36)
@@ -304,9 +304,11 @@
       post :update, :id => contents(:welcome).id, :article => { :title => 'Foo' }, :commit => 'Save without Revision'
     end
   end
-
+
   def test_should_upload_asset
-    assert_difference Asset, :count, 3 do
+    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+
+    assert_difference Asset, :count, asset_count do
       post :upload, :asset => { :uploaded_data => fixture_file_upload('assets/logo.png', 'image/png') }
       assert_response :success
       assert_template 'new'
@@ -314,14 +316,17 @@
   end

   def test_should_upload_asset_and_redirect_to_article
-    assert_difference Asset, :count, 3 do
-      post :upload, :id => contents(:welcome).id, :asset => { :uploaded_data => fixture_file_upload('assets/logo.png', 'image/png') }
+    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+
+    assert_difference Asset, :count, asset_count do
+      post :upload, :id => contents(:welcome).id,
+                    :asset => { :uploaded_data => fixture_file_upload('assets/logo.png', 'image/png') }
       assert_response :success
       assert_template 'edit'
       assert_equal contents(:welcome), assigns(:article)
     end
   end
-
+
   def test_should_not_error_on_new_article_asset_upload
     assert_no_difference Asset, :count do
       post :upload
Index: test/functional/admin/assets_controller_upload_test.rb
===================================================================
--- test/functional/admin/assets_controller_upload_test.rb	(revision 34)
+++ test/functional/admin/assets_controller_upload_test.rb	(revision 36)
@@ -15,22 +15,26 @@
     login_as :quentin
     Fixtures.delete_existing_fixtures_for(Asset.connection, :assets)
   end
-
+
   def test_should_sort_assets
-    assert_difference sites(:first).assets, :count, 21 do
-      assert_difference Asset, :count, 63 do
-        t = 5.months.ago.utc
-        21.times do |i|
-          Time.mock! t + i.days do
-            sites(:first).assets.create(:title => "Asset for #{Time.now.to_s(:db)}", :uploaded_data => fixture_file_upload('assets/logo.png', 'image/png'))
+    if Object.const_defined?(:Magick)
+      assert_difference sites(:first).assets, :count, 21 do
+        assert_difference Asset, :count, 63 do
+          t = 5.months.ago.utc
+          21.times do |i|
+            Time.mock! t + i.days do
+              sites(:first).assets.create(:title => "Asset for #{Time.now.to_s(:db)}",
+                                          :uploaded_data => fixture_file_upload('assets/logo.png', 'image/png'))
+            end
           end
         end
       end
+      get :index
+      assert_response :success
+      assert_models_equal Asset.find(61, 58, 55, 52, :order => 'created_at desc'), assigns(:recent)
+      assert_models_equal Asset.find(*((4..51).to_a.in_groups_of(3).collect(&:first) <<
+                                      {:order => 'created_at desc'})), assigns(:assets)
     end
-    get :index
-    assert_response :success
-    assert_models_equal Asset.find(61, 58, 55, 52, :order => 'created_at desc'), assigns(:recent)
-    assert_models_equal Asset.find(*((4..51).to_a.in_groups_of(3).collect(&:first) << {:order => 'created_at desc'})), assigns(:assets)
   end

   def test_should_edit_asset